commit 74e56438bb63e75b71d927ba797632bd778862ac
author Treehugger Robot <treehugger-gerrit@google.com> Wed Aug 21 23:54:48 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 21 23:54:48 2019 +0000
tree 455673d2ec2f70bebc1fa35d3ced26018c9a71fa
parent 28cf07f93daeea92faddaa3e71fd5ff2095fd407
parent 4ea19214a4d43c90fddb9c427311e8cd9ebfa9e7

Merge "Link libc++demangle."

libc/malloc_debug/Android.bp

diff --git a/libc/malloc_debug/Android.bp b/libc/malloc_debug/Android.bp
index d6b8531..2bff260 100644
--- a/libc/malloc_debug/Android.bp
+++ b/libc/malloc_debug/Android.bp
@@ -27,6 +27,12 @@
     },
     native_coverage: false,
 
+    target: {
+        android: {
+            static_libs: ["libc++demangle"],
+        },
+    },
+
     // -Wno-error=format-zero-length needed for gcc to compile.
     cflags: [
         "-Wall",

linker/Android.bp

diff --git a/linker/Android.bp b/linker/Android.bp
index bdb7c17..e2cdd14 100644
--- a/linker/Android.bp
+++ b/linker/Android.bp
@@ -295,7 +295,10 @@
 
     target: {
         android: {
-            static_libs: ["libdebuggerd_handler_fallback"],
+            static_libs: [
+                "libc++demangle",
+                "libdebuggerd_handler_fallback",
+            ],
         },
     },
     compile_multilib: "both",