commit 9f55716cadd84ad509a4fd3bb0a0202038cf11bd
author Treehugger Robot <treehugger-gerrit@google.com> Fri Dec 28 11:24:00 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 28 11:24:00 2018 +0000
tree b6bb12c69b8968b5e63796d3b584b0082b341768
parent 814aa7101f1a3402419a7e9bc2cca848aeb80823
parent e2bc9fe9d5ac82457bc6050bf705ff43a1b05cbf

Merge "Dynamic linker is explicitly added to runtime APEX"

build/apex/Android.bp

diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index 2095a68..193a3c1 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -25,6 +25,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,
@@ -115,7 +118,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,
@@ -144,7 +148,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