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

Merge "Fix APEX run-time ld.config.txt for ASAN targets" am: 8540f50887

Browse source 
am: 321b1a6345

Change-Id: I465aee0c808c892e520ce3e2574ae6fa0154e142
This commit is contained in:
Logan Chien 2019-02-12 20:29:23 -08:00 • committed by android-build-merger
commit 5d42b599ef
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -409,6 +409,7 @@ namespace.runtime.isolated = true
# Keep in sync with ld.config.txt in the com.android.runtime APEX. # Keep in sync with ld.config.txt in the com.android.runtime APEX.
namespace.runtime.search.paths = /apex/com.android.runtime/${LIB} namespace.runtime.search.paths = /apex/com.android.runtime/${LIB}
namespace.runtime.asan.search.paths = /apex/com.android.runtime/${LIB}
namespace.runtime.links = system namespace.runtime.links = system
# TODO(b/119867084): Restrict to Bionic dlopen dependencies and PALette library # TODO(b/119867084): Restrict to Bionic dlopen dependencies and PALette library
# when it exists. # when it exists.

1
rootdir/etc/ld.config.vndk_lite.txt
View file

@ -350,6 +350,7 @@ namespace.runtime.isolated = true
# Keep in sync with ld.config.txt in the com.android.runtime APEX. # Keep in sync with ld.config.txt in the com.android.runtime APEX.
namespace.runtime.search.paths = /apex/com.android.runtime/${LIB} namespace.runtime.search.paths = /apex/com.android.runtime/${LIB}
namespace.runtime.asan.search.paths = /apex/com.android.runtime/${LIB}
namespace.runtime.links = default namespace.runtime.links = default
# TODO(b/119867084): Restrict to Bionic dlopen dependencies and PALette library # TODO(b/119867084): Restrict to Bionic dlopen dependencies and PALette library
# when it exists. # when it exists.