commit 18d48e1b8072531fe2fa2eb3623dec6bb186cc3a
author Jiyong Park <jiyong@google.com> Mon Oct 23 02:59:15 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 23 02:59:15 2017 +0000
tree 55e9633eb059a91947a91380c3553f5ed17a8b10
parent 727e87f5e91674ff8e12e74d7581a605b5af0c4b
parent e430cffb16588267d7fca79da00645b125b2c534

Use the legacy linker namespace configs when target is sanitized
am: 614c5521a3

Change-Id: I80ff3cb047a9ad351590524a5602cdc0f9df3e61

rootdir/Android.mk

diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index 1bac36c..e6b40ca 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -194,7 +194,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := ld.config.txt
-ifeq ($(PRODUCT_FULL_TREBLE),true)
+ifeq ($(PRODUCT_FULL_TREBLE)|$(SANITIZE_TARGET),true|)
 LOCAL_SRC_FILES := etc/ld.config.txt
 else
 LOCAL_SRC_FILES := etc/ld.config.legacy.txt