summaryrefslogtreecommitdiff
path: root/debuggerd
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-12-07 23:36:59 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-12-07 23:36:59 +0000
commit3608ee5e903689ea7c433587be664649689816e1 (patch)
tree69eeb1700e1a7001f05a3cbae603f3a704e6e057 /debuggerd
parent80bc200d05ef7b753b48ab38ee21375ccb71b37b (diff)
parente2a9563be1d540a1fb91489986bf6a72d54b59c8 (diff)
Merge "Track rename of base/ to android-base/." am: 912ed3d8ca
am: e2a9563be1 * commit 'e2a9563be1d540a1fb91489986bf6a72d54b59c8': Track rename of base/ to android-base/.
Diffstat (limited to 'debuggerd')
-rw-r--r--debuggerd/elf_utils.cpp2
-rw-r--r--debuggerd/test/dump_memory_test.cpp2
-rw-r--r--debuggerd/test/log_fake.cpp2
-rw-r--r--debuggerd/test/tombstone_test.cpp2
-rw-r--r--debuggerd/tombstone.cpp2
-rw-r--r--debuggerd/utility.cpp4
6 files changed, 7 insertions, 7 deletions
diff --git a/debuggerd/elf_utils.cpp b/debuggerd/elf_utils.cpp
index 65c190479..9959f2e1f 100644
--- a/debuggerd/elf_utils.cpp
+++ b/debuggerd/elf_utils.cpp
@@ -24,7 +24,7 @@
#include <string>
#include <backtrace/Backtrace.h>
-#include <base/stringprintf.h>
+#include <android-base/stringprintf.h>
#include <log/log.h>
#include "elf_utils.h"
diff --git a/debuggerd/test/dump_memory_test.cpp b/debuggerd/test/dump_memory_test.cpp
index 75e70284c..2addd5dd6 100644
--- a/debuggerd/test/dump_memory_test.cpp
+++ b/debuggerd/test/dump_memory_test.cpp
@@ -20,7 +20,7 @@
#include <string>
#include <gtest/gtest.h>
-#include <base/file.h>
+#include <android-base/file.h>
#include "BacktraceMock.h"
#include "log_fake.h"
diff --git a/debuggerd/test/log_fake.cpp b/debuggerd/test/log_fake.cpp
index d584a5e28..e27e9f661 100644
--- a/debuggerd/test/log_fake.cpp
+++ b/debuggerd/test/log_fake.cpp
@@ -19,7 +19,7 @@
#include <string>
-#include <base/stringprintf.h>
+#include <android-base/stringprintf.h>
#include <log/log.h>
#include <log/logger.h>
diff --git a/debuggerd/test/tombstone_test.cpp b/debuggerd/test/tombstone_test.cpp
index d945d27ba..96b3a7aae 100644
--- a/debuggerd/test/tombstone_test.cpp
+++ b/debuggerd/test/tombstone_test.cpp
@@ -20,7 +20,7 @@
#include <string>
#include <gtest/gtest.h>
-#include <base/file.h>
+#include <android-base/file.h>
#include "utility.h"
diff --git a/debuggerd/tombstone.cpp b/debuggerd/tombstone.cpp
index e283923d2..5f422e37b 100644
--- a/debuggerd/tombstone.cpp
+++ b/debuggerd/tombstone.cpp
@@ -37,7 +37,7 @@
#include <private/android_filesystem_config.h>
-#include <base/stringprintf.h>
+#include <android-base/stringprintf.h>
#include <cutils/properties.h>
#include <log/log.h>
#include <log/logger.h>
diff --git a/debuggerd/utility.cpp b/debuggerd/utility.cpp
index f5d6ec158..ce214f921 100644
--- a/debuggerd/utility.cpp
+++ b/debuggerd/utility.cpp
@@ -25,9 +25,9 @@
#include <sys/ptrace.h>
#include <sys/wait.h>
+#include <android-base/file.h>
+#include <android-base/stringprintf.h>
#include <backtrace/Backtrace.h>
-#include <base/file.h>
-#include <base/stringprintf.h>
#include <log/log.h>
const int SLEEP_TIME_USEC = 50000; // 0.05 seconds