commit 55a9badf6f06cc40cfd1d5c24217cd04028d9509
author Alex Light <allight@google.com> Tue Jan 29 18:34:09 2019 -0800
committer Alex Light <allight@google.com> Thu Jan 31 10:16:07 2019 -0800
tree a83c3f73a00c125cdba87e243dce28b1987570f8
parent 748d3667b770219d9bf838adb60d324cf97a893c

Include libc in com.android.runtime.host when linux_bionic

linux_bionic is built to use the bionic libc, which needs to be
manually included.

Test: ./art/tools/build_linux_bionic.sh com.android.runtime.host
Bug: 123591866
Change-Id: Ibe365c84713b69732258beb254c651fcf9e076e4

build/apex/Android.bp

diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index 6ede916..47a1e4b 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -197,6 +197,7 @@
     device_supported: false,
     manifest: "manifest.json",
     java_libs: libcore_target_java_libs,
+    ignore_system_library_special_case: true,
     native_shared_libs: art_runtime_base_native_shared_libs
         + art_runtime_debug_native_shared_libs
         + libcore_native_shared_libs
@@ -219,5 +220,14 @@
         darwin: {
             enabled: false,
         },
+        linux_bionic: {
+            enabled: true,
+            multilib: {
+                both: {
+                    native_shared_libs: bionic_native_shared_libs,
+                    binaries: bionic_binaries_both,
+                }
+            }
+        },
     },
 }