commit 4ea19214a4d43c90fddb9c427311e8cd9ebfa9e7
author Dan Albert <danalbert@google.com> Tue Jul 23 13:31:14 2019 -0700
committer Dan Albert <danalbert@google.com> Wed Jul 24 12:16:41 2019 -0700
tree bdff939c77b02aa545e7d8cc840b424a682ee4a3
parent 6b2532e19a76e9b809d2e52e677b1f2004159443

Link libc++demangle.

The demangler is moving out of libc++abi to save on bloat.

Test: make checkbuild
Bug: http://b/138245375
Change-Id: I7402894bb326f524388c9efdf86509dad50f2018

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 5e7a921..1880c27 100644
--- a/linker/Android.bp
+++ b/linker/Android.bp
@@ -300,7 +300,10 @@
 
     target: {
         android: {
-            static_libs: ["libdebuggerd_handler_fallback"],
+            static_libs: [
+                "libc++demangle",
+                "libdebuggerd_handler_fallback",
+            ],
         },
     },
     compile_multilib: "both",