diff options
| author | Anton Hansson <hansson@google.com> | 2018-09-19 00:51:20 +0100 |
|---|---|---|
| committer | Anton Hansson <hansson@google.com> | 2018-09-19 02:53:33 +0100 |
| commit | ece0a746917f8fd463df345907e5ca83dda8e226 (patch) | |
| tree | de2cab6bd57d2c216ae0701581a99377606229d9 /rootdir | |
| parent | 0244428c8e328c3db8a8a7d88ef3e7cf1cbf94a1 (diff) | |
| download | system_core-ece0a746917f8fd463df345907e5ca83dda8e226.tar.gz system_core-ece0a746917f8fd463df345907e5ca83dda8e226.tar.bz2 system_core-ece0a746917f8fd463df345907e5ca83dda8e226.zip | |
Add product_services support to ld.config.vndk_lite
We're moving apps and their libs to product_services for older
devices too, so mimic the rules in the default ld.config related
to product_services.
Also fix a one-off disparity between /product and /product_services
in ld.config.txt.
Bug: 114804489
Test: m out/target/product/marlin/system/etc/ld.config.vndk_lite
Change-Id: I166275c035c85b4d69cff8e9d51af3d6d0ff4857
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} |