Update linkerconfig configuration format
Update linkerconfig configuration format as json.
Bug: 169634881
Test: cuttelfish boot succeeded
Change-Id: I99a090d9ff85992ba24627fb00ec3d9e7e759782
diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index 03b773d..f364187 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -461,9 +461,8 @@
srcs: [":art-check-testing-apex-gen"],
}
-prebuilt_etc {
+linker_config {
name: "art-linker-config",
- src: "linker.config.txt",
- filename: "linker.config.txt",
+ src: "linker.config.json",
installable: false,
}
diff --git a/build/apex/linker.config.json b/build/apex/linker.config.json
new file mode 100644
index 0000000..6880368
--- /dev/null
+++ b/build/apex/linker.config.json
@@ -0,0 +1,7 @@
+{
+ "permittedPaths": [
+ "/data",
+ "/system/framework",
+ "/apex/com.android.art/javalib"
+ ]
+}
diff --git a/build/apex/linker.config.txt b/build/apex/linker.config.txt
deleted file mode 100644
index b960de1..0000000
--- a/build/apex/linker.config.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-# Extra linker configurations for ART APEX
-# See https://android.googlesource.com/platform/system/linkerconfig/+/master/README.md#apex-linker-configuration
-
-[permitted_path]
-# JVMTI libraries used in ART testing are located under /data; dalvikvm has
-# to be able to dlopen them.
-# TODO(b/129534335): Move this to the linker configuration of the Test ART
-# APEX when it is available.
-/data
-
-# odex files are in /system/framework and /apex/com.android.art/javalib.
-# dalvikvm has to be able to dlopen the files for CTS.
-/system/framework
-
-# Primary boot image is loaded through dlopen, so pass the primary boot image
-# to the list of paths.
-/apex/com.android.art/javalib