Bionic libs are explicitly added to runtime APEX
Bionic libs are explicitly added to runtime APEX. This, with the other
change in the bionic project that adds stubs for the libs, makes all
other components outside of the runtime APEX to link against the stubs
lib.
Bug: 120266448
Test: m
Change-Id: I4d687c1aee48f962d69fc8642971006381ae8aee
diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index f2e12f6..0ec0a15 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -19,6 +19,11 @@
"libopenjdkjvmti",
"libadbconnection",
]
+bionic_native_shared_libs = [
+ "libc",
+ "libm",
+ "libdl",
+]
// - Fake library that avoids namespace issues and gives some warnings for nosy apps.
art_runtime_fake_native_shared_libs = [
// FIXME: Does not work as-is, because `libart_fake` is defined in libart_fake/Android.mk,
@@ -102,7 +107,8 @@
compile_multilib: "both",
manifest: "manifest.json",
native_shared_libs: art_runtime_base_native_shared_libs
- + art_runtime_fake_native_shared_libs,
+ + art_runtime_fake_native_shared_libs
+ + bionic_native_shared_libs,
multilib: {
both: {
// TODO: Add logic to create a `dalvikvm` symlink to `dalvikvm32` or `dalvikvm64`
@@ -130,7 +136,8 @@
manifest: "manifest.json",
native_shared_libs: art_runtime_base_native_shared_libs
+ art_runtime_fake_native_shared_libs
- + art_runtime_debug_native_shared_libs,
+ + art_runtime_debug_native_shared_libs
+ + bionic_native_shared_libs,
multilib: {
both: {
// TODO: Add logic to create a `dalvikvm` symlink to `dalvikvm32` or `dalvikvm64`