summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libc/malloc_debug/Android.bp6
-rw-r--r--linker/Android.bp5
2 files changed, 10 insertions, 1 deletions
diff --git a/libc/malloc_debug/Android.bp b/libc/malloc_debug/Android.bp
index d6b85319e..2bff260d8 100644
--- a/libc/malloc_debug/Android.bp
+++ b/libc/malloc_debug/Android.bp
@@ -27,6 +27,12 @@ cc_library_static {
},
native_coverage: false,
+ target: {
+ android: {
+ static_libs: ["libc++demangle"],
+ },
+ },
+
// -Wno-error=format-zero-length needed for gcc to compile.
cflags: [
"-Wall",
diff --git a/linker/Android.bp b/linker/Android.bp
index bdb7c178a..e2cdd1484 100644
--- a/linker/Android.bp
+++ b/linker/Android.bp
@@ -295,7 +295,10 @@ cc_binary {
target: {
android: {
- static_libs: ["libdebuggerd_handler_fallback"],
+ static_libs: [
+ "libc++demangle",
+ "libdebuggerd_handler_fallback",
+ ],
},
},
compile_multilib: "both",