From ab34b47b359aced9e363f4e4d7018a82720f6868 Mon Sep 17 00:00:00 2001
From: Dan Willemsen <dwillemsen@google.com>
Date: Tue, 29 Nov 2016 13:32:55 -0800
Subject: [PATCH] Enable libbase/libutils/libziparchive on host bionic

Bug: 31559095
Test: Test linux_bionic compile
Change-Id: Ib42c063532c1cbeb3e1418ab16a1fb54d5902aab
---
 base/Android.bp          |  5 +++++
 libutils/Android.bp      |  7 +++++++
 libziparchive/Android.bp | 12 +++++++++++-
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/base/Android.bp b/base/Android.bp
index e6ad15bf4..b9a6e0bd6 100644
--- 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
index 25c779ea1..217b8c378 100644
--- 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
index 5ed0fe853..fce137852 100644
--- 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"],
         },
     },