From 4ea19214a4d43c90fddb9c427311e8cd9ebfa9e7 Mon Sep 17 00:00:00 2001
From: Dan Albert <danalbert@google.com>
Date: Tue, 23 Jul 2019 13:31:14 -0700
Subject: [PATCH] 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 | 6 ++++++
 linker/Android.bp            | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

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