diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-01-24 12:23:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-01-24 12:23:36 +0000 |
| commit | 6b6259a08347b16d0ee74a28f2e2651cfa7da729 (patch) | |
| tree | 018d40cb32402cefe10521356b1ad8eb9df96538 /rootdir | |
| parent | 24a2c1a70c52840e06bd05aba9e8e1e357b527de (diff) | |
| parent | 59e355c4418fb711f1be9ae747748e357b214dbc (diff) | |
| download | system_core-6b6259a08347b16d0ee74a28f2e2651cfa7da729.tar.gz system_core-6b6259a08347b16d0ee74a28f2e2651cfa7da729.tar.bz2 system_core-6b6259a08347b16d0ee74a28f2e2651cfa7da729.zip | |
Merge "Add search paths for asan build"
Diffstat (limited to 'rootdir')
| -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 1d4b1e280..54e7c7e01 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 d54156be6..39f69caf9 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 |