commit 16d893266b99f0a0acdf6c7b2e45f4764eed7bfe
author Jiyong Park <jiyong@google.com> Mon Oct 23 03:16:15 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 23 03:16:15 2017 +0000
tree 914d542676eb578931755a2668e752f24a71225a
parent be1ac10048d49b12c6a8232972db0ab7272a4fb9
parent 18d48e1b8072531fe2fa2eb3623dec6bb186cc3a

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

Change-Id: I9b372e8064457a0441e8a42837fa7ab2d74627cd

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