From 6f3263d5f4cdccfd7bcf02d7e7304a28b4ea80e7 Mon Sep 17 00:00:00 2001
From: Alex Light <allight@google.com>
Date: Wed, 27 Feb 2019 14:37:14 -0800
Subject: Add linux_bionic support

Test: ./art/tools/build_linux_bionic.sh com.android.support.apexer
Bug: 119332365
Bug: 119332362
Change-Id: I582f23a5c4ddb388f6a16562e51ca572ca4fe8a0
---
 Android.bp | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/Android.bp b/Android.bp
index b6dc00e2c1..82d293ebbc 100644
--- a/Android.bp
+++ b/Android.bp
@@ -48,6 +48,11 @@ cc_defaults {
         android_x86: {
             local_include_dirs: ["android_x86/pyconfig"],
         },
+        linux_bionic: {
+            // NB linux_bionic is a 'host' architecture but it uses the bionic libc like 'android'
+            // targets so use the android pyconfig.
+            local_include_dirs: ["android_x86_64/pyconfig"],
+        },
         android_x86_64: {
             local_include_dirs: ["android_x86_64/pyconfig"],
         },
@@ -834,12 +839,7 @@ cc_library_static {
         "Modules/_sqlite/util.c",
     ],
     target: {
-        linux_glibc_x86_64: {
-            static_libs: [
-                "libsqlite",
-            ],
-        },
-        darwin_x86_64: {
+        host: {
             static_libs: [
                 "libsqlite",
             ],
@@ -928,6 +928,12 @@ cc_library_static {
                 "Modules/_ctypes/libffi/src/x86/darwin64.S",
             ],
         },
+        linux_bionic: {
+            local_include_dirs: ["linux_x86_64/libffi"],
+            srcs: [
+                "Modules/_ctypes/libffi/src/x86/unix64.S",
+            ],
+        },
         linux_glibc_x86_64: {
             local_include_dirs: ["linux_x86_64/libffi"],
             srcs: [
-- 
cgit v1.2.3