summaryrefslogtreecommitdiffstats
path: root/rootdir
diff options
context:
space:
mode:
authorPeter Collingbourne <pcc@google.com>2019-06-13 13:05:56 -0700
committerStephen Hines <srhines@google.com>2019-06-14 14:57:45 -0700
commitc58c10a973d5aa9206ed7f6dfb64a733b62ea63d (patch)
tree51f06a375a5e7ebc5a62e979c6875e362ca4d509 /rootdir
parent702981f54fd3a891f42f3282497b7e73b74b350a (diff)
downloadsystem_core-c58c10a973d5aa9206ed7f6dfb64a733b62ea63d.tar.gz
system_core-c58c10a973d5aa9206ed7f6dfb64a733b62ea63d.tar.bz2
system_core-c58c10a973d5aa9206ed7f6dfb64a733b62ea63d.zip
Link the sanitizer runtime libraries to the default unrestricted namespace.
Without this, binaries can't be run out of /data/local/tmp on a HWASANified device. Bug: http://b/134503977 Test: Chromium's /data/local/tmp/md5sum/md5sum_bin works on walleye_hwasan-userdebug Change-Id: Ieceaab8aae0024864022ca42b38aa36e6212cf31 (cherry picked from commit 563ca3815494b47d5af100c6d9b9595e0bc89372)
Diffstat (limited to 'rootdir')
-rw-r--r--rootdir/etc/ld.config.txt1
-rw-r--r--rootdir/etc/ld.config.vndk_lite.txt1
2 files changed, 2 insertions, 0 deletions
diff --git a/rootdir/etc/ld.config.txt b/rootdir/etc/ld.config.txt
index 320b0a682..c95f60fb0 100644
--- a/rootdir/etc/ld.config.txt
+++ b/rootdir/etc/ld.config.txt
@@ -605,6 +605,7 @@ namespace.default.link.runtime.shared_libs += libandroidicu.so
# 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
diff --git a/rootdir/etc/ld.config.vndk_lite.txt b/rootdir/etc/ld.config.vndk_lite.txt
index 5db7698f4..564255926 100644
--- a/rootdir/etc/ld.config.vndk_lite.txt
+++ b/rootdir/etc/ld.config.vndk_lite.txt
@@ -417,6 +417,7 @@ namespace.default.link.runtime.shared_libs += libandroidicu.so
# 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