diff options
| author | Elliott Hughes <enh@google.com> | 2015-12-07 17:49:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-12-07 17:49:14 +0000 |
| commit | 440f0c2dceee4c212e7ceff912f9b3ba2c8c42fb (patch) | |
| tree | 6ed4b3b03a4bca83ad32a5e9d5945902d7ddfdc2 | |
| parent | d550bfdbb78a7c6e1ce1f2a8df088d11d127bee1 (diff) | |
| parent | 49038bc4906084b1177b1ae8d2b3349527944920 (diff) | |
| download | unwinding-440f0c2dceee4c212e7ceff912f9b3ba2c8c42fb.tar.gz | |
Merge "Track rename of base/ to android-base/."
| -rw-r--r-- | libbacktrace/Backtrace.cpp | 2 | ||||
| -rw-r--r-- | libbacktrace/backtrace_test.cpp | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/libbacktrace/Backtrace.cpp b/libbacktrace/Backtrace.cpp index 555e8cf..df94280 100644 --- a/libbacktrace/Backtrace.cpp +++ b/libbacktrace/Backtrace.cpp @@ -22,7 +22,7 @@ #include <string> -#include <base/stringprintf.h> +#include <android-base/stringprintf.h> #include <backtrace/Backtrace.h> #include <backtrace/BacktraceMap.h> diff --git a/libbacktrace/backtrace_test.cpp b/libbacktrace/backtrace_test.cpp index ce04817..23636db 100644 --- a/libbacktrace/backtrace_test.cpp +++ b/libbacktrace/backtrace_test.cpp @@ -42,7 +42,7 @@ #include <backtrace/Backtrace.h> #include <backtrace/BacktraceMap.h> -#include <base/stringprintf.h> +#include <android-base/stringprintf.h> #include <cutils/atomic.h> #include <cutils/threads.h> @@ -1461,4 +1461,3 @@ TEST(libbacktrace, check_for_leak_remote) { ASSERT_EQ(waitpid(pid, nullptr, 0), pid); } #endif - |