commit 4326d84d217b40b819729da153f97217ea4ec932
author Dan Willemsen <dwillemsen@google.com> Sun May 07 13:07:41 2017 -0700
committer Dan Willemsen <dwillemsen@google.com> Wed Sep 20 13:16:13 2017 -0700
tree 3df9e5e520f66ffdb5c33080ff99d12ccba7cacd
parent e27d29cfaf7923a68bd2f987590b229c53f6b50c

linker: Only link to debuggerd on Android

Don't link to it when building with bionic for the host.

Also add libasync_safe, which is used by linker_globals.h even when
debuggerd isn't used.

Bug: 31559095
Test: mma
Test: Attempt to build host bionic
Change-Id: I374e2c2c288133875da82de780b27917ca524240

linker/Android.bp

diff --git a/linker/Android.bp b/linker/Android.bp
index f96e038..5775426 100644
--- a/linker/Android.bp
+++ b/linker/Android.bp
@@ -136,7 +136,7 @@
         "libbase",
         "libz",
 
-        "libdebuggerd_handler_fallback",
+        "libasync_safe",
 
         "liblog",
         "libc++_static",
@@ -156,7 +156,7 @@
     },
     target: {
         android: {
-            static_libs: ["libdebuggerd_client"],
+            static_libs: ["libdebuggerd_handler_fallback"],
         },
         android64: {
             cflags: ["-DTARGET_IS_64_BIT"],