ld.config: Permit legacy /system/vendor paths Because /vendor is a symlink to /system/vendor on devices without a dedicated /vendor partition, /system/vendor/lib/* needs to be added to the permitted paths whereever /vendor/lib/* is permitted. Reasoning: Legacy devices are forced to use ld.config.legacy.txt, which is very permissive. We can prolong support for them and enable them to use the VNDK if we extend the search paths to include the resolved symlink dirs. Merged-In: I6b3bb7b86ed82395345a16bdc857353b1b15c704 Change-Id: I6b3bb7b86ed82395345a16bdc857353b1b15c704
diff --git a/rootdir/etc/ld.config.txt b/rootdir/etc/ld.config.txt index a0b1996..2e2d3a4 100644 --- a/rootdir/etc/ld.config.txt +++ b/rootdir/etc/ld.config.txt
@@ -59,6 +59,9 @@ namespace.default.permitted.paths += /vendor/framework namespace.default.permitted.paths += /vendor/app namespace.default.permitted.paths += /vendor/priv-app +namespace.default.permitted.paths += /system/vendor/framework +namespace.default.permitted.paths += /system/vendor/app +namespace.default.permitted.paths += /system/vendor/priv-app namespace.default.permitted.paths += /odm/framework namespace.default.permitted.paths += /odm/app namespace.default.permitted.paths += /odm/priv-app @@ -84,6 +87,9 @@ namespace.default.asan.permitted.paths += /vendor/framework namespace.default.asan.permitted.paths += /vendor/app namespace.default.asan.permitted.paths += /vendor/priv-app +namespace.default.asan.permitted.paths += /system/vendor/framework +namespace.default.asan.permitted.paths += /system/vendor/app +namespace.default.asan.permitted.paths += /system/vendor/priv-app namespace.default.asan.permitted.paths += /odm/framework namespace.default.asan.permitted.paths += /odm/app namespace.default.asan.permitted.paths += /odm/priv-app @@ -115,6 +121,7 @@ namespace.sphal.permitted.paths = /odm/${LIB} namespace.sphal.permitted.paths += /vendor/${LIB} +namespace.sphal.permitted.paths += /system/vendor/${LIB} namespace.sphal.asan.search.paths = /data/asan/odm/${LIB} namespace.sphal.asan.search.paths += /odm/${LIB} @@ -157,6 +164,7 @@ namespace.rs.permitted.paths = /odm/${LIB} namespace.rs.permitted.paths += /vendor/${LIB} +namespace.rs.permitted.paths += /system/vendor/${LIB} namespace.rs.permitted.paths += /data namespace.rs.asan.search.paths = /data/asan/odm/${LIB}/vndk-sp @@ -202,6 +210,8 @@ namespace.vndk.permitted.paths += /odm/${LIB}/egl namespace.vndk.permitted.paths += /vendor/${LIB}/hw namespace.vndk.permitted.paths += /vendor/${LIB}/egl +namespace.vndk.permitted.paths += /system/vendor/${LIB}/hw +namespace.vndk.permitted.paths += /system/vendor/${LIB}/egl # This is exceptionally required since android.hidl.memory@1.0-impl.so is here namespace.vndk.permitted.paths += /system/${LIB}/vndk-sp%VNDK_VER%/hw @@ -265,6 +275,7 @@ namespace.default.permitted.paths = /odm namespace.default.permitted.paths += /vendor +namespace.default.permitted.paths += /system/vendor namespace.default.asan.search.paths = /data/asan/odm/${LIB} namespace.default.asan.search.paths += /odm/${LIB}
diff --git a/rootdir/etc/ld.config.vndk_lite.txt b/rootdir/etc/ld.config.vndk_lite.txt index db65c14..fdb5c9c 100644 --- a/rootdir/etc/ld.config.vndk_lite.txt +++ b/rootdir/etc/ld.config.vndk_lite.txt
@@ -73,6 +73,7 @@ namespace.sphal.permitted.paths = /odm/${LIB} namespace.sphal.permitted.paths += /vendor/${LIB} +namespace.sphal.permitted.paths += /system/vendor/${LIB} namespace.sphal.asan.search.paths = /data/asan/odm/${LIB} namespace.sphal.asan.search.paths += /odm/${LIB} @@ -115,6 +116,7 @@ namespace.rs.permitted.paths = /odm/${LIB} namespace.rs.permitted.paths += /vendor/${LIB} +namespace.rs.permitted.paths += /system/vendor/${LIB} namespace.rs.permitted.paths += /data namespace.rs.asan.search.paths = /data/asan/odm/${LIB}/vndk-sp @@ -160,6 +162,7 @@ namespace.vndk.permitted.paths += /odm/${LIB}/egl namespace.vndk.permitted.paths += /vendor/${LIB}/hw namespace.vndk.permitted.paths += /vendor/${LIB}/egl +namespace.vndk.permitted.paths += /system/vendor/${LIB}/egl # This is exceptionally required since android.hidl.memory@1.0-impl.so is here namespace.vndk.permitted.paths += /system/${LIB}/vndk-sp%VNDK_VER%/hw