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

Commit b7d35b7d authored by Jiyong Park's avatar Jiyong Park Committed by android-build-merger
Browse files

Merge "/vendor/lib/hw is removed from search paths for vendor default ns" am: 3388af49 

am: 17f0ae76

Change-Id: I62a4d5e4b8fa8ed4d74bd6dd28dff0ee34e96f3a
parents 07669293 17f0ae76

rootdir/etc/ld.config.txt

+1 −12
Original line number Diff line number Diff line
@@ -258,12 +258,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}



# TODO(b/70551668) Remove /vendor/${LIB}/hw from search paths.

# Shared libraries in the directory should be dlopened with full file paths.

# This is a workaround for some legacy prebuilt binaries.

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



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 += /data/asan/odm/${LIB}/vndk

namespace.default.asan.search.paths +=           /odm/${LIB}/vndk
@@ -281,9 +276,3 @@ namespace.default.asan.search.paths += /data/asan/system/${LIB}/vndk-sp${VNDK_VE 
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}
 


# TODO(b/70551668) Remove /vendor/${LIB}/hw from search paths.

# Shared libraries in the directory should be dlopened with full file paths.

# This is a workaround for some legacy prebuilt binaries.

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

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

rootdir/etc/ld.config.txt.in

+0 −7
Original line number Diff line number Diff line
@@ -240,9 +240,6 @@ namespace.default.search.paths += /vendor/${LIB} 
namespace.default.search.paths += /vendor/${LIB}/vndk

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



# TODO(b/70551668) remove this

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



namespace.default.permitted.paths  = /odm

namespace.default.permitted.paths += /vendor
@@ -259,10 +256,6 @@ 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



# TODO(b/70551668) remove this

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

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



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

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

namespace.default.asan.permitted.paths += /data/asan/vendor