ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Update ld config to use build-time determined paths."

Browse source 
am: 70b3fdce20

Change-Id: I40b3bd729c7b62b6cf37e42b5a9df06b5b6fa001
This commit is contained in:
Anton Hansson 2018-09-19 17:13:08 -07:00 • committed by android-build-merger
commit 5933e83e1d
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
rootdir/etc/ld.config.txt
View file

@ -78,9 +78,9 @@ namespace.default.permitted.paths += /mnt/expand
namespace.default.asan.search.paths = /data/asan/system/${LIB} namespace.default.asan.search.paths = /data/asan/system/${LIB}
namespace.default.asan.search.paths += /system/${LIB} namespace.default.asan.search.paths += /system/${LIB}
namespace.default.asan.search.paths += /data/asan/product/${LIB} namespace.default.asan.search.paths += /data/asan/product/${LIB}
namespace.default.asan.search.paths += /product/${LIB} namespace.default.asan.search.paths += /%PRODUCT%/${LIB}
namespace.default.asan.search.paths += /data/asan/product_services/${LIB} namespace.default.asan.search.paths += /data/asan/product_services/${LIB}
namespace.default.asan.search.paths += /product_services/${LIB} namespace.default.asan.search.paths += /%PRODUCT_SERVICES%/${LIB}
namespace.default.asan.permitted.paths = /data namespace.default.asan.permitted.paths = /data
namespace.default.asan.permitted.paths += /system/${LIB}/drm namespace.default.asan.permitted.paths += /system/${LIB}/drm
@ -345,7 +345,7 @@ namespace.system.search.paths += /%PRODUCT_SERVICES%/${LIB}
namespace.system.asan.search.paths = /data/asan/system/${LIB} namespace.system.asan.search.paths = /data/asan/system/${LIB}
namespace.system.asan.search.paths += /system/${LIB} namespace.system.asan.search.paths += /system/${LIB}
namespace.system.asan.search.paths += /data/asan/product/${LIB} namespace.system.asan.search.paths += /data/asan/product/${LIB}
namespace.system.asan.search.paths += /product/${LIB} namespace.system.asan.search.paths += /%PRODUCT%/${LIB}
############################################################################### ###############################################################################
# Namespace config for binaries under /postinstall. # Namespace config for binaries under /postinstall.

12
rootdir/etc/ld.config.vndk_lite.txt
View file

@ -7,7 +7,7 @@
# absolute path of an executable is selected. # absolute path of an executable is selected.
dir.system = /system/bin/ dir.system = /system/bin/
dir.system = /system/xbin/ dir.system = /system/xbin/
dir.system = /product/bin/ dir.system = /%PRODUCT%/bin/
dir.vendor = /odm/bin/ dir.vendor = /odm/bin/
dir.vendor = /vendor/bin/ dir.vendor = /vendor/bin/
@ -41,7 +41,7 @@ namespace.default.isolated = false
namespace.default.search.paths = /system/${LIB} namespace.default.search.paths = /system/${LIB}
namespace.default.search.paths += /odm/${LIB} namespace.default.search.paths += /odm/${LIB}
namespace.default.search.paths += /vendor/${LIB} namespace.default.search.paths += /vendor/${LIB}
namespace.default.search.paths += /product/${LIB} namespace.default.search.paths += /%PRODUCT%/${LIB}
namespace.default.asan.search.paths = /data/asan/system/${LIB} namespace.default.asan.search.paths = /data/asan/system/${LIB}
namespace.default.asan.search.paths += /system/${LIB} namespace.default.asan.search.paths += /system/${LIB}
@ -50,7 +50,7 @@ namespace.default.asan.search.paths += /odm/${LIB}
namespace.default.asan.search.paths += /data/asan/vendor/${LIB} namespace.default.asan.search.paths += /data/asan/vendor/${LIB}
namespace.default.asan.search.paths += /vendor/${LIB} namespace.default.asan.search.paths += /vendor/${LIB}
namespace.default.asan.search.paths += /data/asan/product/${LIB} namespace.default.asan.search.paths += /data/asan/product/${LIB}
namespace.default.asan.search.paths += /product/${LIB} namespace.default.asan.search.paths += /%PRODUCT%/${LIB}
############################################################################### ###############################################################################
# "sphal" namespace # "sphal" namespace
@ -209,7 +209,7 @@ namespace.default.search.paths += /vendor/${LIB}/vndk-sp
namespace.default.search.paths += /system/${LIB}/vndk%VNDK_VER% 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}/vndk-sp%VNDK_VER%
namespace.default.search.paths += /system/${LIB} namespace.default.search.paths += /system/${LIB}
namespace.default.search.paths += /product/${LIB} namespace.default.search.paths += /%PRODUCT%/${LIB}
namespace.default.asan.search.paths = /data/asan/odm/${LIB} namespace.default.asan.search.paths = /data/asan/odm/${LIB}
namespace.default.asan.search.paths += /odm/${LIB} namespace.default.asan.search.paths += /odm/${LIB}
@ -230,7 +230,7 @@ namespace.default.asan.search.paths += /system/${LIB}/vndk-sp%VNDK_VER
namespace.default.asan.search.paths += /data/asan/system/${LIB} namespace.default.asan.search.paths += /data/asan/system/${LIB}
namespace.default.asan.search.paths += /system/${LIB} namespace.default.asan.search.paths += /system/${LIB}
namespace.default.asan.search.paths += /data/asan/product/${LIB} namespace.default.asan.search.paths += /data/asan/product/${LIB}
namespace.default.asan.search.paths += /product/${LIB} namespace.default.asan.search.paths += /%PRODUCT%/${LIB}
############################################################################### ###############################################################################
# Namespace config for binaries under /postinstall. # Namespace config for binaries under /postinstall.
@ -243,4 +243,4 @@ namespace.default.asan.search.paths += /product/${LIB}
[postinstall] [postinstall]
namespace.default.isolated = false namespace.default.isolated = false
namespace.default.search.paths = /system/${LIB} namespace.default.search.paths = /system/${LIB}
namespace.default.search.paths += /product/${LIB} namespace.default.search.paths += /%PRODUCT%/${LIB}