commit c9f24e88581b9e2929abea6792caa2d58ace7cb5
author Kiyoung Kim <kiyoungkim@google.com> Tue Oct 20 21:12:21 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Oct 20 21:12:21 2020 +0000
tree a311d57d30cbcca944712055334140fc4bdf21bd
parent 92cd3cb2192237765ab67561966941fb205768d7
parent c31812c4a32330fa2971002c20c2ec787d1a3a0d

Merge "Update linkerconfig configuration format" am: 6f27296e13 am: 91fecb51c2 am: e1311102cf am: c31812c4a3

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

Change-Id: I1a241dc073a45a7660b9ce44bec7f814669c1fdc

apex/Android.bp

diff --git a/apex/Android.bp b/apex/Android.bp
index ef296d6..80e751c 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -64,10 +64,9 @@
     ],
 }
 
-prebuilt_etc {
+linker_config {
     name: "media-linker-config",
-    src: "linker.config.txt",
-    filename: "linker.config.txt",
+    src: "linker.config.json",
     installable: false,
 }
 

apex/linker.config.json

diff --git a/apex/linker.config.json b/apex/linker.config.json
new file mode 100644
index 0000000..67c076e
--- /dev/null
+++ b/apex/linker.config.json
@@ -0,0 +1,3 @@
+{
+    "visible": true
+}

apex/linker.config.txt

diff --git a/apex/linker.config.txt b/apex/linker.config.txt
deleted file mode 100644
index d1c815b..0000000
--- a/apex/linker.config.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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