Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0244428c authored by Anton Hansson's avatar Anton Hansson
Browse files

Update ld config to use build-time determined paths. 

A few places had /product and /product_services hardcoded. Update
them to use values that get set at build time.

Bug: 114804489
Test: m out/target/product/marlin/system/etc/ld.config.vndk_lite.txt
Change-Id: Ie48dbb2453ae941c1b5ee57f092d12a5497d878f
parent d800caf3

rootdir/etc/ld.config.txt

+3 −3
Original line number Diff line number Diff line
@@ -78,9 +78,9 @@ namespace.default.permitted.paths += /mnt/expand 
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 +=           /%PRODUCT%/${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 += /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 +=           /system/${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.

rootdir/etc/ld.config.vndk_lite.txt

+6 −6
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
# absolute path of an executable is selected.

dir.system = /system/bin/

dir.system = /system/xbin/

dir.system = /product/bin/

dir.system = /%PRODUCT%/bin/



dir.vendor = /odm/bin/

dir.vendor = /vendor/bin/
@@ -41,7 +41,7 @@ namespace.default.isolated = false 
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%/${LIB}



namespace.default.asan.search.paths  = /data/asan/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 +=           /vendor/${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
@@ -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-sp%VNDK_VER%

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 +=           /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 +=           /system/${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.
@@ -243,4 +243,4 @@ namespace.default.asan.search.paths += /product/${LIB} 
[postinstall]

namespace.default.isolated = false

namespace.default.search.paths  = /system/${LIB}

namespace.default.search.paths += /product/${LIB}
 
namespace.default.search.paths += /%PRODUCT%/${LIB}