openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "/vendor/lib/hw is removed from search paths for vendor default ns"

This commit is contained in:
Treehugger Robot 2017-12-20 02:19:14 +00:00 committed by Gerrit Code Review
parent 51c2088f3b 483cd2e2fe
commit 3388af49e6
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