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

Commit ece0a746 authored by Anton Hansson's avatar Anton Hansson
Browse files

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
parent 0244428c

rootdir/etc/ld.config.txt

+2 −1
Original line number Diff line number Diff line
@@ -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.

rootdir/etc/ld.config.vndk_lite.txt

+7 −0
Original line number Diff line number Diff line
@@ -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}