commit 8f400540426a07d47a716156e6cfd2ea06f6e9cf
author android-build-team Robot <android-build-team-robot@google.com> Sat Jun 15 23:19:07 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sat Jun 15 23:19:07 2019 +0000
tree 51f06a375a5e7ebc5a62e979c6875e362ca4d509
parent 07edda66814fae1af05d27e62680f0e675156ee9
parent 002b990a56df2d2657022fa421861802b86038c8

Snap for 5663715 from c58c10a973d5aa9206ed7f6dfb64a733b62ea63d to qt-qpr1-release

Change-Id: I7a1ce57c60c47ccf7b49da07fe56c5b4867bdaef

rootdir/etc/ld.config.txt

diff --git a/rootdir/etc/ld.config.txt b/rootdir/etc/ld.config.txt
index 320b0a6..c95f60f 100644
--- a/rootdir/etc/ld.config.txt
+++ b/rootdir/etc/ld.config.txt
@@ -605,6 +605,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 5db7698..5642559 100644
--- a/rootdir/etc/ld.config.vndk_lite.txt
+++ b/rootdir/etc/ld.config.vndk_lite.txt
@@ -417,6 +417,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