commit 6f27296e13d89407459d23882c9345c6b6e212b0
author Kiyoung Kim <kiyoungkim@google.com> Tue Oct 20 00:23:58 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 20 00:23:58 2020 +0000
tree 437e6e985a6494d7e1385755e4e2a1a2f62dde99
parent 2deeebcd7a61a5d5a468c79ae4ce2fc543eed49a
parent b5aa33d5858a03a7e6f754a5a1320fadb98c4dba

Merge "Update linkerconfig configuration format"

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