Enable libbase/libutils/libziparchive on host bionic

am: ab34b47 Change-Id: If8e762eace58a494efede9ef5cb09be99b74e5b8
aosp-mirror · Nov 30, 2016 · 69b0123 · 69b0123
2 parents 895cd44 + ab34b47
commit 69b0123
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/base/Android.bp b/base/Android.bp
@@ -49,6 +49,11 @@ cc_library {
             srcs: ["errors_unix.cpp"],
             cppflags: ["-Wexit-time-destructors"],
         },
+        linux_bionic: {
+            srcs: ["errors_unix.cpp"],
+            cppflags: ["-Wexit-time-destructors"],
+            enabled: true,
+        },
         linux: {
             srcs: ["errors_unix.cpp"],
             cppflags: ["-Wexit-time-destructors"],

diff --git a/libutils/Android.bp b/libutils/Android.bp
@@ -86,6 +86,13 @@ cc_library {
                 "ProcessCallStack.cpp",
             ],
         },
+        linux_bionic: {
+            enabled: true,
+            srcs: [
+                "Looper.cpp",
+                "ProcessCallStack.cpp",
+            ],
+        },
 
         darwin: {
             cflags: ["-Wno-unused-parameter"],

diff --git a/libziparchive/Android.bp b/libziparchive/Android.bp
@@ -62,7 +62,17 @@ cc_library {
         android: {
             static_libs: ["libz"],
         },
-        host: {
+        linux_bionic: {
+            static_libs: ["libz"],
+            enabled: true,
+        },
+        linux: {
+            shared_libs: ["libz-host"],
+        },
+        darwin: {
+            shared_libs: ["libz-host"],
+        },
+        windows: {
             shared_libs: ["libz-host"],
         },
     },