commit 3b4c0f6222a6c73d8b1f1f19c98cde8042ce6be3
author Peter Collingbourne <pcc@google.com> Thu Jun 13 23:50:02 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Jun 13 23:50:02 2019 -0700
tree 87d12d6122a3f828c15c2530a54c3baed6edb06e
parent d656a0acd5a9b713fd16cf20aedd0629aa1e065a
parent 939a605763ff7c5a5dc73165dd6e0f447b82f487

Merge "Link the sanitizer runtime libraries to the default unrestricted namespace."
am: 2d620c00f3

Change-Id: I76b87f8ddc10409fad653aacdecd84293cd64179

rootdir/etc/ld.config.txt

diff --git a/rootdir/etc/ld.config.txt b/rootdir/etc/ld.config.txt
index 7f129f8..b1616d3 100644
--- a/rootdir/etc/ld.config.txt
+++ b/rootdir/etc/ld.config.txt
@@ -617,6 +617,7 @@
 
 # TODO(b/122876336): Remove libpac.so once it's migrated to Webview
 namespace.default.link.runtime.shared_libs += libpac.so
+namespace.default.link.runtime.shared_libs += %SANITIZER_RUNTIME_LIBRARIES%
 
 namespace.default.link.resolv.shared_libs = libnetd_resolv.so
 

rootdir/etc/ld.config.vndk_lite.txt

diff --git a/rootdir/etc/ld.config.vndk_lite.txt b/rootdir/etc/ld.config.vndk_lite.txt
index 0880be0..9212408 100644
--- a/rootdir/etc/ld.config.vndk_lite.txt
+++ b/rootdir/etc/ld.config.vndk_lite.txt
@@ -428,6 +428,7 @@
 
 # TODO(b/122876336): Remove libpac.so once it's migrated to Webview
 namespace.default.link.runtime.shared_libs += libpac.so
+namespace.default.link.runtime.shared_libs += %SANITIZER_RUNTIME_LIBRARIES%
 
 namespace.default.link.resolv.shared_libs = libnetd_resolv.so