Dynamic linker is explicitly added to runtime APEX
Bionic libs are already in the runtime APEX. Since dynamic linker has to
be in sync with the bionic libs, the linker is also added to the APEX.
Bug: 120266448
Test: m com.android.runtime.debug
Examine the built APEX and check that linker and linker64 exist under
./bin directory
Change-Id: I7d2e0f04d9fbe2082797a73e2c27f406d96f1ac0
diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index 0ec0a15..30eb489 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -24,6 +24,9 @@
"libm",
"libdl",
]
+bionic_binaries_both = [
+ "linker",
+]
// - 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,
@@ -113,7 +116,8 @@
both: {
// TODO: Add logic to create a `dalvikvm` symlink to `dalvikvm32` or `dalvikvm64`
// (see `symlink_preferred_arch` in art/dalvikvm/Android.bp).
- binaries: art_runtime_base_binaries_both,
+ binaries: art_runtime_base_binaries_both
+ + bionic_binaries_both,
},
prefer32: {
binaries: art_runtime_base_binaries_prefer32,
@@ -142,7 +146,8 @@
both: {
// TODO: Add logic to create a `dalvikvm` symlink to `dalvikvm32` or `dalvikvm64`
// (see `symlink_preferred_arch` in art/dalvikvm/Android.bp).
- binaries: art_runtime_base_binaries_both,
+ binaries: art_runtime_base_binaries_both
+ + bionic_binaries_both,
},
prefer32: {
binaries: art_runtime_base_binaries_prefer32