Enable libc/libdl/libm/linker for host bionic
Disables debuggerd integration unless building for android.
Bug: 31559095
Test: Diff out/soong/build.ninja before/after, only change is moving
linker's libdebuggerd_client static lib to the beginning of the
list.
Test: lunch aosp_arm64-eng; mmma -j bionic
Change-Id: I62e725f7a9b98b7fe31637d0a835fd5846b0aff0
diff --git a/linker/Android.bp b/linker/Android.bp
index 4d770ac..5745d73 100644
--- a/linker/Android.bp
+++ b/linker/Android.bp
@@ -1,6 +1,7 @@
cc_library_static {
name: "liblinker_malloc",
clang: true,
+ defaults: ["linux_bionic_supported"],
srcs: [
"linker_allocator.cpp",
@@ -13,6 +14,7 @@
cc_binary {
clang: true,
+ defaults: ["linux_bionic_supported"],
srcs: [
"dlfcn.cpp",
@@ -112,7 +114,6 @@
"libbase",
"libz",
"liblog",
- "libdebuggerd_client",
// Important: The liblinker_malloc should be the last library in the list
// to overwrite any other malloc implementations by other static libraries.
@@ -131,9 +132,15 @@
},
},
target: {
+ android: {
+ static_libs: ["libdebuggerd_client"],
+ },
android64: {
cflags: ["-DTARGET_IS_64_BIT"],
},
+ linux_bionic: {
+ cflags: ["-DTARGET_IS_64_BIT"],
+ },
},
compile_multilib: "both",