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

Merge "Linker: Add ASAN support to treble ld.config" into oc-dev

Browse source
This commit is contained in:
TreeHugger Robot 2017-04-26 00:28:55 +00:00 • committed by Android (Google) Code Review
commit 57e3528d2e
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -21,12 +21,18 @@ namespace.default.isolated = false
namespace.default.search.paths = /system/${LIB}:/vendor/${LIB} namespace.default.search.paths = /system/${LIB}:/vendor/${LIB}
namespace.default.permitted.paths = /system/${LIB}:/vendor/${LIB} namespace.default.permitted.paths = /system/${LIB}:/vendor/${LIB}
namespace.default.asan.search.paths = /data/asan/system/${LIB}:/system/${LIB}:/data/asan/vendor/${LIB}:/vendor/${LIB}
namespace.default.asan.permitted.paths = /data/asan/system/${LIB}:/system/${LIB}:/data/asan/vendor/${LIB}:/vendor/${LIB}
# TODO(b/37013858): remove all dependencies to /vendor/lib from system processes # TODO(b/37013858): remove all dependencies to /vendor/lib from system processes
# When this is done, comment out following three lines and remove the three # When this is done, comment out following three lines and remove the three
# lines above # lines above
#namespace.default.isolated = true #namespace.default.isolated = true
#namespace.default.search.paths = /system/${LIB} #namespace.default.search.paths = /system/${LIB}
#namespace.default.permitted.paths = /system/${LIB} #namespace.default.permitted.paths = /system/${LIB}
#
#namespace.default.asan.search.paths = /data/asan/system/${LIB}:/system/${LIB}
#namespace.default.asan.permitted.paths = /data/asan/system/${LIB}:/system/${LIB}
############################################################################### ###############################################################################
# "sphal" namespace # "sphal" namespace
@ -46,6 +52,9 @@ namespace.sphal.visible = true
namespace.sphal.search.paths = /vendor/${LIB}/egl:/vendor/${LIB}/hw:/vendor/${LIB} namespace.sphal.search.paths = /vendor/${LIB}/egl:/vendor/${LIB}/hw:/vendor/${LIB}
namespace.sphal.permitted.paths = /vendor/${LIB} namespace.sphal.permitted.paths = /vendor/${LIB}
namespace.sphal.asan.search.paths = /data/asan/vendor/${LIB}/egl:/vendor/${LIB}/egl:/data/asan/vendor/${LIB}/hw:/vendor/${LIB}/hw:/data/asan/vendor/${LIB}:/vendor/${LIB}
namespace.sphal.asan.permitted.paths = /data/asan/vendor/${LIB}:/vendor/${LIB}
# Once in this namespace, access to libraries in /system/lib is restricted. Only # Once in this namespace, access to libraries in /system/lib is restricted. Only
# libs listed here can be used. # libs listed here can be used.
namespace.sphal.links = default,vndk namespace.sphal.links = default,vndk
@ -69,6 +78,9 @@ namespace.vndk.isolated = true
namespace.vndk.search.paths = /vendor/${LIB}/vndk-sp:/vendor/${LIB} namespace.vndk.search.paths = /vendor/${LIB}/vndk-sp:/vendor/${LIB}
namespace.vndk.permitted.paths = /vendor/${LIB}/hw:/vendor/${LIB}/egl namespace.vndk.permitted.paths = /vendor/${LIB}/hw:/vendor/${LIB}/egl
namespace.vndk.asan.search.paths = /data/asan/vendor/${LIB}/vndk-sp:/vendor/${LIB}/vndk-sp:/data/asan/vendor/${LIB}:/vendor/${LIB}
namespace.vndk.asan.permitted.paths = /data/asan/vendor/${LIB}/hw:/vendor/${LIB}/hw:/data/asan/vendor/${LIB}/egl:/vendor/${LIB}/egl
# When these NDK libs are required inside this namespace, then it is redirected # When these NDK libs are required inside this namespace, then it is redirected
# to the default namespace. This is possible since their ABI is stable across # to the default namespace. This is possible since their ABI is stable across
# Android releases. # Android releases.
@ -85,3 +97,5 @@ namespace.vndk.link.default.shared_libs = libc.so:libz.so:libm.so:libdl.so:libst
[vendor] [vendor]
namespace.default.isolated = false namespace.default.isolated = false
namespace.default.search.paths = /vendor/${LIB}:/vendor/${LIB}/vndk-sp:/system/${LIB} namespace.default.search.paths = /vendor/${LIB}:/vendor/${LIB}/vndk-sp:/system/${LIB}
namespace.default.asan.search.paths = /data/asan/vendor/${LIB}:/vendor/${LIB}:/data/asan/vendor/${LIB}/vndk-sp:/vendor/${LIB}/vndk-sp:/data/asan/system/${LIB}:/system/${LIB}