diff options
| author | Elliott Hughes <enh@google.com> | 2015-02-05 19:25:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-02-05 19:25:51 +0000 |
| commit | 542b3ad7f760e55cb775f4633219a44173cb3d5e (patch) | |
| tree | ea4c9c0579038bd43ceeb7d0e2e5ea41ab1112ce | |
| parent | c8fcdaa0d0d4b4c93660fea15bee06e4893796ad (diff) | |
| parent | 8ebfa959df5e5504063e61e249232bb885a9fe2e (diff) | |
| download | linux-tools-perf-542b3ad7f760e55cb775f4633219a44173cb3d5e.tar.gz | |
Merge "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) |