diff options
Diffstat (limited to 'rootdir')
| -rw-r--r-- | rootdir/etc/ld.config.txt | 3 | ||||
| -rw-r--r-- | rootdir/etc/ld.config.vndk_lite.txt | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/rootdir/etc/ld.config.txt b/rootdir/etc/ld.config.txt index 245589c33..d3e80c992 100644 --- a/rootdir/etc/ld.config.txt +++ b/rootdir/etc/ld.config.txt @@ -8,7 +8,6 @@ dir.system = /system/bin/ dir.system = /system/xbin/ dir.system = /%PRODUCT%/bin/ -dir.system = /%PRODUCT_SERVICES%/bin/ dir.vendor = /odm/bin/ dir.vendor = /vendor/bin/ @@ -346,6 +345,8 @@ namespace.system.asan.search.paths = /data/asan/system/${LIB} namespace.system.asan.search.paths += /system/${LIB} namespace.system.asan.search.paths += /data/asan/product/${LIB} namespace.system.asan.search.paths += /%PRODUCT%/${LIB} +namespace.system.asan.search.paths += /data/asan/product_services/${LIB} +namespace.system.asan.search.paths += /%PRODUCT_SERVICES%/${LIB} ############################################################################### # Namespace config for binaries under /postinstall. diff --git a/rootdir/etc/ld.config.vndk_lite.txt b/rootdir/etc/ld.config.vndk_lite.txt index 97088d031..7e354aca6 100644 --- a/rootdir/etc/ld.config.vndk_lite.txt +++ b/rootdir/etc/ld.config.vndk_lite.txt @@ -42,6 +42,7 @@ namespace.default.search.paths = /system/${LIB} namespace.default.search.paths += /odm/${LIB} namespace.default.search.paths += /vendor/${LIB} namespace.default.search.paths += /%PRODUCT%/${LIB} +namespace.default.search.paths += /%PRODUCT_SERVICES%/${LIB} namespace.default.asan.search.paths = /data/asan/system/${LIB} namespace.default.asan.search.paths += /system/${LIB} @@ -51,6 +52,8 @@ namespace.default.asan.search.paths += /data/asan/vendor/${LIB} namespace.default.asan.search.paths += /vendor/${LIB} namespace.default.asan.search.paths += /data/asan/product/${LIB} namespace.default.asan.search.paths += /%PRODUCT%/${LIB} +namespace.default.asan.search.paths += /data/asan/product_services/${LIB} +namespace.default.asan.search.paths += /%PRODUCT_SERVICES%/${LIB} ############################################################################### # "sphal" namespace @@ -210,6 +213,7 @@ namespace.default.search.paths += /system/${LIB}/vndk%VNDK_VER% namespace.default.search.paths += /system/${LIB}/vndk-sp%VNDK_VER% namespace.default.search.paths += /system/${LIB} namespace.default.search.paths += /%PRODUCT%/${LIB} +namespace.default.search.paths += /%PRODUCT_SERVICES%/${LIB} namespace.default.asan.search.paths = /data/asan/odm/${LIB} namespace.default.asan.search.paths += /odm/${LIB} @@ -231,6 +235,8 @@ namespace.default.asan.search.paths += /data/asan/system/${LIB} namespace.default.asan.search.paths += /system/${LIB} namespace.default.asan.search.paths += /data/asan/product/${LIB} namespace.default.asan.search.paths += /%PRODUCT%/${LIB} +namespace.default.asan.search.paths += /data/asan/product_services/${LIB} +namespace.default.asan.search.paths += /%PRODUCT_SERVICES%/${LIB} ############################################################################### # Namespace config for binaries under /postinstall. @@ -244,3 +250,4 @@ namespace.default.asan.search.paths += /%PRODUCT%/${LIB} namespace.default.isolated = false namespace.default.search.paths = /system/${LIB} namespace.default.search.paths += /%PRODUCT%/${LIB} +namespace.default.search.paths += /%PRODUCT_SERVICES%/${LIB} |