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

Merge "Separate VNDK libs into another linker namespace"

Browse source 
am: b00ed37a66

Change-Id: Icd85a59b1357f7931c4e8b84e57ec45273b1bc73
This commit is contained in:
Logan Chien 2017-12-21 17:45:36 +00:00 • committed by android-build-merger
commit 3d5afa7b34
1 changed files with 36 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -218,7 +218,7 @@ namespace.vndk.link.default.shared_libs += %SANITIZER_RUNTIME_LIBRARIES%
# (LL-NDK only) access. # (LL-NDK only) access.
############################################################################### ###############################################################################
[vendor] [vendor]
additional.namespaces = system additional.namespaces = system,vndk
############################################################################### ###############################################################################
# "default" namespace # "default" namespace
@ -261,10 +261,39 @@ namespace.default.asan.permitted.paths += /odm
namespace.default.asan.permitted.paths += /data/asan/vendor namespace.default.asan.permitted.paths += /data/asan/vendor
namespace.default.asan.permitted.paths += /vendor namespace.default.asan.permitted.paths += /vendor
namespace.default.links = system namespace.default.links = system,vndk
namespace.default.link.system.shared_libs = %LLNDK_LIBRARIES% namespace.default.link.system.shared_libs = %LLNDK_LIBRARIES%
namespace.default.link.system.shared_libs += %VNDK_SAMEPROCESS_LIBRARIES% namespace.default.link.vndk.shared_libs = %VNDK_SAMEPROCESS_LIBRARIES%
namespace.default.link.system.shared_libs += %VNDK_CORE_LIBRARIES% namespace.default.link.vndk.shared_libs += %VNDK_CORE_LIBRARIES%
###############################################################################
# "vndk" namespace
#
# This namespace is where VNDK and VNDK-SP libraries are loaded for
# a vendor process.
###############################################################################
namespace.vndk.isolated = false
namespace.vndk.search.paths = /system/${LIB}/vndk-sp${VNDK_VER}
namespace.vndk.search.paths += /system/${LIB}/vndk${VNDK_VER}
# This is exceptionally required since android.hidl.memory@1.0-impl.so is here
namespace.vndk.permitted.paths = /system/${LIB}/vndk-sp${VNDK_VER}/hw
namespace.vndk.asan.permitted.paths += /data/asan/system/${LIB}/vndk-sp${VNDK_VER}/hw
namespace.vndk.asan.permitted.paths += /system/${LIB}/vndk-sp${VNDK_VER}/hw
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}
# When these NDK libs are required inside this namespace, then it is redirected
# to the system namespace. This is possible since their ABI is stable across
# Android releases.
namespace.vndk.links = system
namespace.vndk.link.system.shared_libs = %LLNDK_LIBRARIES%
namespace.vndk.link.system.shared_libs += %SANITIZER_RUNTIME_LIBRARIES%
############################################################################### ###############################################################################
# "system" namespace # "system" namespace
@ -274,13 +303,7 @@ namespace.default.link.system.shared_libs += %VNDK_CORE_LIBRARIES%
############################################################################### ###############################################################################
namespace.system.isolated = false namespace.system.isolated = false
namespace.system.search.paths = /system/${LIB}/vndk-sp${VNDK_VER} namespace.system.search.paths = /system/${LIB}
namespace.system.search.paths += /system/${LIB}/vndk${VNDK_VER}
namespace.system.search.paths += /system/${LIB}
namespace.system.asan.search.paths = /data/asan/system/${LIB}/vndk-sp${VNDK_VER} namespace.system.asan.search.paths = /data/asan/system/${LIB}
namespace.system.asan.search.paths += /system/${LIB}/vndk-sp${VNDK_VER}
namespace.system.asan.search.paths += /data/asan/system/${LIB}/vndk${VNDK_VER}
namespace.system.asan.search.paths += /system/${LIB}/vndk${VNDK_VER}
namespace.system.asan.search.paths += /data/asan/system/${LIB}
namespace.system.asan.search.paths += /system/${LIB} namespace.system.asan.search.paths += /system/${LIB}