commit 61b1637bd8470e3367c6970662d91e9cc50f8f45
author Alistair Strachan <astrachan@google.com> Thu May 16 14:45:58 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 16 14:45:58 2019 +0000
tree 301bce9cc21754d513ef5410c6474964ef3a9ddb
parent 137c0002dbfa15a0b57dd1c82688986cc8a66339
parent 302419203ae43d8f0e006bcb484765d0f9d5b6a2

Merge "Add asan.permitted.paths for the media namespace" into qt-dev

rootdir/etc/ld.config.txt

diff --git a/rootdir/etc/ld.config.txt b/rootdir/etc/ld.config.txt
index 91a4373..72aaa84 100644
--- a/rootdir/etc/ld.config.txt
+++ b/rootdir/etc/ld.config.txt
@@ -174,6 +174,7 @@
 namespace.media.asan.search.paths = /apex/com.android.media/${LIB}
 
 namespace.media.permitted.paths = /apex/com.android.media/${LIB}/extractors
+namespace.media.asan.permitted.paths = /apex/com.android.media/${LIB}/extractors
 
 namespace.media.links = default
 namespace.media.link.default.shared_libs  = %LLNDK_LIBRARIES%
@@ -616,6 +617,7 @@
 namespace.media.asan.search.paths = /apex/com.android.media/${LIB}
 
 namespace.media.permitted.paths = /apex/com.android.media/${LIB}/extractors
+namespace.media.asan.permitted.paths = /apex/com.android.media/${LIB}/extractors
 
 namespace.media.links = default
 namespace.media.link.default.shared_libs  = %LLNDK_LIBRARIES%