diff --git a/rootdir/etc/ld.config.vndk.txt b/rootdir/etc/ld.config.vndk.txt index 063aab923..adffd92e1 100644 --- a/rootdir/etc/ld.config.vndk.txt +++ b/rootdir/etc/ld.config.vndk.txt @@ -23,25 +23,21 @@ additional.namespaces = sphal,vndk,rs ############################################################################### # "default" namespace # -# Framework-side code runs in this namespace. Anything from /vendor partition +# Framework-side code runs in this namespace. Libs from /vendor partition # can't be loaded in this namespace. ############################################################################### -namespace.default.isolated = false +namespace.default.isolated = true +# TODO(b/63553457): remove /vendor/lib from the search path. For now, this is +# required since the classloader namespace for vendor apks should have access +# vendor libraries in the directory. These search paths are copied to the search +# paths of the classloader namespace. namespace.default.search.paths = /system/${LIB}:/vendor/${LIB} -namespace.default.permitted.paths = /system/${LIB}:/vendor/${LIB} +# /vendor/app, /vendor/framework were added since libart should be able to dlopen +# the odex files from the directory. +namespace.default.permitted.paths = /system/${LIB}/drm:/system/${LIB}/hw:/system/framework:/system/app:/system/priv-app:/vendor/app:/vendor/framework:/oem/app:/data:/mnt/expand namespace.default.asan.search.paths = /data/asan/system/${LIB}:/system/${LIB}:/data/asan/vendor/${LIB}:/vendor/${LIB} -namespace.default.asan.permitted.paths = /data/asan/system/${LIB}:/system/${LIB}:/data/asan/vendor/${LIB}:/vendor/${LIB} - -# TODO(b/37013858): remove all dependencies to /vendor/lib from system processes -# When this is done, comment out following three lines and remove the three -# lines above -#namespace.default.isolated = true -#namespace.default.search.paths = /system/${LIB} -#namespace.default.permitted.paths = /system/${LIB} -# -#namespace.default.asan.search.paths = /data/asan/system/${LIB}:/system/${LIB} -#namespace.default.asan.permitted.paths = /data/asan/system/${LIB}:/system/${LIB} +namespace.default.asan.permitted.paths = /data:/system/${LIB}/drm:/system/${LIB}/hw:/system/framework:/system/app:/system/priv-app:/vendor/app:/vendor/framework:/oem/app:/mnt/expand ############################################################################### # "sphal" namespace