commit d49910df9e21902a567cf950967d2560cf8379b0
author Kiyoung Kim <kiyoungkim@google.com> Wed Sep 16 05:09:50 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Sep 16 05:09:50 2020 +0000
tree 52e2008b394e59665ad6bfe81dc7ea30e71ac49b
parent 8289ee069ee0cdb0fab66dc07096036935028b52
parent 0977b2eaf7d708fd90b500938a08e88565b86ab6

Merge "Mark Media APEX as visible" am: b1dd3d1d3e am: f14fd4fafe am: 4c9f66ba38 am: 8b71134468 am: 0977b2eaf7

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1422788

Change-Id: I543d67c61676c46572d550c22eab52241a8fa365

apex/Android.bp

diff --git a/apex/Android.bp b/apex/Android.bp
index c1ef3d8..ef296d6 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -59,6 +59,16 @@
     name: "com.android.media",
     manifest: "manifest.json",
     defaults: ["com.android.media-defaults"],
+    prebuilts: [
+        "media-linker-config",
+    ],
+}
+
+prebuilt_etc {
+    name: "media-linker-config",
+    src: "linker.config.txt",
+    filename: "linker.config.txt",
+    installable: false,
 }
 
 filegroup {

apex/linker.config.txt

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