aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKiyoung Kim <kiyoungkim@google.com>2020-10-06 17:26:13 +0900
committerKiyoung Kim <kiyoungkim@google.com>2020-10-06 17:28:19 +0900
commit2d4bbf24158649b992f949fa28516b020f8afb19 (patch)
treef6c453421a39c5dbdba78e27246c33d348c9f432
parent6c19d67a7355c189e0f1ea9b01e357ec82d4059f (diff)
downloadbionic-2d4bbf24158649b992f949fa28516b020f8afb19.tar.gz
Update linkerconfig configuration format
Update linkerconfig configuration format as json. Bug: 169634881 Test: cuttelfish boot succeeded Change-Id: I297ffc9e5c8d8916b2e7e0b3e837b6b82247401b
-rw-r--r--apex/Android.bp5
-rw-r--r--apex/linker.config.json3
-rw-r--r--apex/linker.config.txt6
3 files changed, 5 insertions, 9 deletions
diff --git a/apex/Android.bp b/apex/Android.bp
index c6c4cbf09..5bf078ab9 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -80,9 +80,8 @@ module_exports {
},
}
-prebuilt_etc {
+linker_config {
name: "bionic-linker-config",
- src: "linker.config.txt",
- filename: "linker.config.txt",
+ src: "linker.config.json",
installable: false,
}
diff --git a/apex/linker.config.json b/apex/linker.config.json
new file mode 100644
index 000000000..67c076eca
--- /dev/null
+++ b/apex/linker.config.json
@@ -0,0 +1,3 @@
+{
+ "visible": true
+}
diff --git a/apex/linker.config.txt b/apex/linker.config.txt
deleted file mode 100644
index 7bac3d65c..000000000
--- a/apex/linker.config.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# 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