diff options
| author | Jiyong Park <jiyong@google.com> | 2019-01-24 15:08:06 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2019-01-24 15:08:06 +0900 |
| commit | 59e355c4418fb711f1be9ae747748e357b214dbc (patch) | |
| tree | 3a9e27ba39bfe0bd8afa58c21b396c898797a70c | |
| parent | ed3f1a584a7a157b4baa84f8d3d05806d20f9059 (diff) | |
Add search paths for asan build
Bug: 123292626
Test: aosp_cf_x86_pasan boots
Change-Id: Ifdc86285cbb2d7eb2b1e39983981e7b81aec59c9
| -rw-r--r-- | rootdir/etc/ld.config.txt | 3 | ||||
| -rw-r--r-- | rootdir/etc/ld.config.vndk_lite.txt | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/rootdir/etc/ld.config.txt b/rootdir/etc/ld.config.txt index 1d4b1e2802..54e7c7e014 100644 --- a/rootdir/etc/ld.config.txt +++ b/rootdir/etc/ld.config.txt @@ -127,6 +127,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. @@ -141,6 +142,7 @@ namespace.media.isolated = true namespace.media.visible = true namespace.media.search.paths = /apex/com.android.media/${LIB} +namespace.media.asan.search.paths = /apex/com.android.media/${LIB} namespace.media.links = default namespace.media.link.default.shared_libs = %LLNDK_LIBRARIES% @@ -158,6 +160,7 @@ namespace.conscrypt.visible = true # Keep in sync with ld.config.txt in the com.android.runtime APEX. namespace.conscrypt.search.paths = /apex/com.android.conscrypt/${LIB} +namespace.conscrypt.asan.search.paths = /apex/com.android.conscrypt/${LIB} namespace.conscrypt.links = default namespace.conscrypt.link.default.shared_libs = libc.so namespace.conscrypt.link.default.shared_libs += libm.so diff --git a/rootdir/etc/ld.config.vndk_lite.txt b/rootdir/etc/ld.config.vndk_lite.txt index d54156be60..39f69caf90 100644 --- a/rootdir/etc/ld.config.vndk_lite.txt +++ b/rootdir/etc/ld.config.vndk_lite.txt @@ -76,6 +76,7 @@ namespace.runtime.isolated = true # Keep in sync with the default namespace in the com.android.runtime APEX # ld.config.txt. 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. @@ -90,6 +91,7 @@ namespace.media.isolated = true namespace.media.visible = true namespace.media.search.paths = /apex/com.android.media/${LIB} +namespace.media.asan.search.paths = /apex/com.android.media/${LIB} namespace.media.links = default namespace.media.link.default.shared_libs = %LLNDK_LIBRARIES% @@ -107,6 +109,7 @@ namespace.conscrypt.visible = true # Keep in sync with ld.config.txt in the com.android.runtime APEX. namespace.conscrypt.search.paths = /apex/com.android.conscrypt/${LIB} +namespace.conscrypt.asan.search.paths = /apex/com.android.conscrypt/${LIB} namespace.conscrypt.links = default namespace.conscrypt.link.default.shared_libs = libc.so namespace.conscrypt.link.default.shared_libs += libm.so |