summaryrefslogtreecommitdiff
path: root/apex
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-01-13 09:08:43 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-01-13 09:08:43 +0000
commita93e29dc1ad37d4e6810fdecff221dc69e7135ab (patch)
treee22db16ffa01308d84a272e35aa11706dbd1df6a /apex
parent7668c8acf2e490b8505081b6a994bcd9efa4a5f9 (diff)
parent40d17632c5136816efd2c55c38ec7eabdf6046b6 (diff)
Merge "Add /system/lib to the permitted paths for ns of APEXes" am: 3c9b9af153 am: 7132f8552a am: 40d17632c5
Change-Id: I1dd3f90e1279fda9529996c4eefdcf4e48baa91d
Diffstat (limited to 'apex')
-rw-r--r--apex/ld.config.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/apex/ld.config.txt b/apex/ld.config.txt
index 1c44e6584c..713f0b7fc9 100644
--- a/apex/ld.config.txt
+++ b/apex/ld.config.txt
@@ -22,6 +22,12 @@ namespace.default.visible = true
namespace.default.search.paths = /apex/com.android.media.swcodec/${LIB}
namespace.default.asan.search.paths = /apex/com.android.media.swcodec/${LIB}
+# Below lines are required to be able to access libs in APEXes which are
+# actually symlinks to the files under /system/lib. The symlinks exist for
+# bundled APEXes to reduce space.
+namespace.default.permitted.paths = /system/${LIB}
+namespace.default.asan.permitted.paths = /system/${LIB}
+
namespace.default.links = platform
# TODO: replace the following when apex has a way to auto-generate this list