diff options
| author | Elliott Hughes <enh@google.com> | 2015-02-05 20:27:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-05 20:27:12 +0000 |
| commit | 112f9b646c754982856c0d49649c54b0667602c2 (patch) | |
| tree | ea4c9c0579038bd43ceeb7d0e2e5ea41ab1112ce | |
| parent | 2e67ba910035f9ad79065863e86e6091cd679379 (diff) | |
| parent | 77db2216fd4cf7464089fcc24ebd543413dcade3 (diff) | |
| download | linux-tools-perf-112f9b646c754982856c0d49649c54b0667602c2.tar.gz | |
am 77db2216: am 542b3ad7: Merge "Use the libcxxabi __cxa_demangle."
* commit '77db2216fd4cf7464089fcc24ebd543413dcade3':
Use the libcxxabi __cxa_demangle.
| -rw-r--r-- | android-fixes.h | 2 | ||||
| -rw-r--r-- | perf-3.12.0/tools/perf/Android.mk | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/android-fixes.h b/android-fixes.h index 7b86608..0963966 100644 --- a/android-fixes.h +++ b/android-fixes.h @@ -3,7 +3,7 @@ #include <stddef.h> -/* In external/gcc-demangle. */ +/* In libcxxabi. */ extern char* __cxa_demangle(const char*, char*, size_t*, int*); /* So we can say HAVE_CPLUS_DEMANGLE (since we don't have libbfd). */ diff --git a/perf-3.12.0/tools/perf/Android.mk b/perf-3.12.0/tools/perf/Android.mk index 30f8414..93f901c 100644 --- a/perf-3.12.0/tools/perf/Android.mk +++ b/perf-3.12.0/tools/perf/Android.mk @@ -300,7 +300,6 @@ LOCAL_STATIC_LIBRARIES := \ libdw \ libebl \ libelf \ - libgccdemangle \ LOCAL_CFLAGS += $(common_predefined_macros) LOCAL_CFLAGS += $(common_compiler_flags) @@ -331,7 +330,6 @@ LOCAL_STATIC_LIBRARIES := \ libdw \ libebl \ libelf \ - libgccdemangle \ LOCAL_CFLAGS += $(common_predefined_macros) $(host_predefined_macros) LOCAL_CFLAGS += $(common_compiler_flags) |