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

Commit 736e4f10 authored by Logan Chien's avatar Logan Chien Committed by android-build-merger
Browse files

Merge "ld.config.txt: Move vendor vndk to vndk namespace" am: c6805c3e am: 0779a259 

am: 5aa3d78e

Change-Id: I68cbb5429e57f6f2a72775c5fc50b4b5e20b8cd4
parents c2b45664 5aa3d78e

rootdir/etc/ld.config.txt.in

+14 −14
Original line number Diff line number Diff line
@@ -234,27 +234,15 @@ namespace.default.isolated = true 
namespace.default.visible = true



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

namespace.default.search.paths += /odm/${LIB}/vndk

namespace.default.search.paths += /odm/${LIB}/vndk-sp

namespace.default.search.paths += /vendor/${LIB}

namespace.default.search.paths += /vendor/${LIB}/vndk

namespace.default.search.paths += /vendor/${LIB}/vndk-sp



namespace.default.permitted.paths  = /odm

namespace.default.permitted.paths += /vendor



namespace.default.asan.search.paths  = /data/asan/odm/${LIB}

namespace.default.asan.search.paths +=           /odm/${LIB}

namespace.default.asan.search.paths += /data/asan/odm/${LIB}/vndk

namespace.default.asan.search.paths +=           /odm/${LIB}/vndk

namespace.default.asan.search.paths += /data/asan/odm/${LIB}/vndk-sp

namespace.default.asan.search.paths +=           /odm/${LIB}/vndk-sp

namespace.default.asan.search.paths += /data/asan/vendor/${LIB}

namespace.default.asan.search.paths +=           /vendor/${LIB}

namespace.default.asan.search.paths += /data/asan/vendor/${LIB}/vndk

namespace.default.asan.search.paths +=           /vendor/${LIB}/vndk

namespace.default.asan.search.paths += /data/asan/vendor/${LIB}/vndk-sp

namespace.default.asan.search.paths +=           /vendor/${LIB}/vndk-sp



namespace.default.asan.permitted.paths  = /data/asan/odm

namespace.default.asan.permitted.paths +=           /odm
@@ -274,10 +262,22 @@ namespace.default.link.vndk.shared_libs += %VNDK_CORE_LIBRARIES% 
###############################################################################

namespace.vndk.isolated = false



namespace.vndk.search.paths  = /system/${LIB}/vndk-sp%VNDK_VER%

namespace.vndk.search.paths  = /odm/${LIB}/vndk

namespace.vndk.search.paths += /odm/${LIB}/vndk-sp

namespace.vndk.search.paths += /vendor/${LIB}/vndk

namespace.vndk.search.paths += /vendor/${LIB}/vndk-sp

namespace.vndk.search.paths += /system/${LIB}/vndk-sp%VNDK_VER%

namespace.vndk.search.paths += /system/${LIB}/vndk%VNDK_VER%



namespace.vndk.asan.search.paths  = /data/asan/system/${LIB}/vndk-sp%VNDK_VER%

namespace.vndk.asan.search.paths  = /data/asan/odm/${LIB}/vndk

namespace.vndk.asan.search.paths +=           /odm/${LIB}/vndk

namespace.vndk.asan.search.paths += /data/asan/odm/${LIB}/vndk-sp

namespace.vndk.asan.search.paths +=           /odm/${LIB}/vndk-sp

namespace.vndk.asan.search.paths += /data/asan/vendor/${LIB}/vndk

namespace.vndk.asan.search.paths +=           /vendor/${LIB}/vndk

namespace.vndk.asan.search.paths += /data/asan/vendor/${LIB}/vndk-sp

namespace.vndk.asan.search.paths +=           /vendor/${LIB}/vndk-sp

namespace.vndk.asan.search.paths += /data/asan/system/${LIB}/vndk-sp%VNDK_VER%

namespace.vndk.asan.search.paths +=           /system/${LIB}/vndk-sp%VNDK_VER%

namespace.vndk.asan.search.paths += /data/asan/system/${LIB}/vndk%VNDK_VER%

namespace.vndk.asan.search.paths +=           /system/${LIB}/vndk%VNDK_VER%