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

am: 5d42b599ef

Change-Id: Ie571a679d43de4f34f119647040bbacea6a4f010
This commit is contained in:
Logan Chien 2019-02-12 21:11:14 -08:00 committed by android-build-merger
commit 172f147a64
2 changed files with 2 additions and 0 deletions

View file

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

View file

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