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

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

Browse source 
am: 17f0ae765e

Change-Id: I62a4d5e4b8fa8ed4d74bd6dd28dff0ee34e96f3a
This commit is contained in:
Jiyong Park 2017-12-20 02:27:14 +00:00 • committed by android-build-merger
commit b7d35b7d09
2 changed files with 1 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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

7
rootdir/etc/ld.config.txt.in
View file

@ -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