summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2017-03-15 15:23:36 -0700
committerDan Willemsen <dwillemsen@google.com>2017-03-15 15:44:00 -0700
commite0cd1e043dbcbe9e4a134584b16339a753d2f69c (patch)
tree1625815eb6c3713df1aaa19af5331ee4ba89e6de
parente7b335b4712bc650c93b5b5777a6f8b1d85ad83f (diff)
downloadcore-e0cd1e043dbcbe9e4a134584b16339a753d2f69c.tar.gz
core-e0cd1e043dbcbe9e4a134584b16339a753d2f69c.tar.bz2
core-e0cd1e043dbcbe9e4a134584b16339a753d2f69c.zip
Enable more modules on linux_bionic builds
Bug: 31559095 Test: Enable host bionic, run soong Change-Id: Ib4ebd909322cf464b6a40040e4b60ece7d905b6f
-rw-r--r--debuggerd/Android.bp1
-rw-r--r--libbacktrace/Android.bp12
-rw-r--r--libcutils/Android.bp14
-rw-r--r--libprocinfo/Android.bp3
-rw-r--r--libutils/Android.bp7
5 files changed, 31 insertions, 6 deletions
diff --git a/debuggerd/Android.bp b/debuggerd/Android.bp
index b385ea52b..2d6c7f599 100644
--- a/debuggerd/Android.bp
+++ b/debuggerd/Android.bp
@@ -1,5 +1,6 @@
cc_defaults {
name: "debuggerd_defaults",
+ defaults: ["linux_bionic_supported"],
cflags: [
"-Wall",
"-Wextra",
diff --git a/libbacktrace/Android.bp b/libbacktrace/Android.bp
index 5b31ecb9f..0e7c6f37f 100644
--- a/libbacktrace/Android.bp
+++ b/libbacktrace/Android.bp
@@ -80,6 +80,18 @@ cc_library {
static_libs: ["libcutils"],
host_ldlibs: ["-lrt"],
},
+ linux_bionic: {
+ enabled: true,
+ srcs: libbacktrace_sources,
+
+ shared_libs: [
+ "libbase",
+ "liblog",
+ "libunwind",
+ ],
+
+ static_libs: ["libcutils"],
+ },
android: {
srcs: libbacktrace_sources,
diff --git a/libcutils/Android.bp b/libcutils/Android.bp
index cf3119590..f668f18e5 100644
--- a/libcutils/Android.bp
+++ b/libcutils/Android.bp
@@ -41,9 +41,12 @@ cc_library_headers {
host_supported: true,
export_include_dirs: ["include"],
target: {
- windows: {
- enabled: true,
- },
+ linux_bionic: {
+ enabled: true,
+ },
+ windows: {
+ enabled: true,
+ },
},
}
@@ -68,11 +71,14 @@ cc_library {
"threads.c",
],
-
target: {
host: {
srcs: ["dlmalloc_stubs.c"],
},
+ linux_bionic: {
+ enabled: true,
+ exclude_srcs: ["dlmalloc_stubs.c"],
+ },
not_windows: {
srcs: libcutils_nonwindows_sources + [
"ashmem-host.c",
diff --git a/libprocinfo/Android.bp b/libprocinfo/Android.bp
index 8e17f1b1b..c13ffe9d3 100644
--- a/libprocinfo/Android.bp
+++ b/libprocinfo/Android.bp
@@ -35,6 +35,9 @@ cc_library {
darwin: {
enabled: false,
},
+ linux_bionic: {
+ enabled: true,
+ },
windows: {
enabled: false,
},
diff --git a/libutils/Android.bp b/libutils/Android.bp
index 0c777b103..2b98fef98 100644
--- a/libutils/Android.bp
+++ b/libutils/Android.bp
@@ -17,9 +17,12 @@ cc_library_headers {
host_supported: true,
export_include_dirs: ["include"],
target: {
+ linux_bionic: {
+ enabled: true,
+ },
windows: {
- enabled: true,
- },
+ enabled: true,
+ },
},
}