commit 66ae134614cbac430d12fde8b6d51cd02ae432a8
author Kiyoung Kim <kiyoungkim@google.com> Wed Sep 16 01:47:23 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 16 01:47:23 2020 +0000
tree 709acbd9103c65e24dcd668f9b3a24bc1b1b438d
parent 1efa57383214fbb7873ee83908ae68406a45ea76
parent 5a8189f141a741a94a4228e17c7764953e4ec713

Merge "Mark bionic APEX as visible"

apex/Android.bp

diff --git a/apex/Android.bp b/apex/Android.bp
index 100430d..c6c4cbf 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -36,6 +36,9 @@
     },
     key: "com.android.runtime.key",
     certificate: ":com.android.runtime.certificate",
+    prebuilts: [
+        "bionic-linker-config",
+    ],
 }
 
 sdk {
@@ -76,3 +79,10 @@
         },
     },
 }
+
+prebuilt_etc {
+    name: "bionic-linker-config",
+    src: "linker.config.txt",
+    filename: "linker.config.txt",
+    installable: false,
+}

apex/linker.config.txt

diff --git a/apex/linker.config.txt b/apex/linker.config.txt
new file mode 100644
index 0000000..7bac3d6
--- /dev/null
+++ b/apex/linker.config.txt
@@ -0,0 +1,6 @@
+# Extra linker configurations for bionic APEX
+# See https://android.googlesource.com/platform/system/linkerconfig/+/master/README.md#apex_etc_linker_config_txt
+
+[properties]
+# Set bionic APEX as force visible so bionic APEX namespace is accessible via android_get_exported_namespace
+visible = true