commit b9c03dd878bb089b72b13ed8e8f874c789cdf2be
author Steven Moreland <smoreland@google.com> Mon Nov 13 21:13:50 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Nov 13 21:13:50 2017 +0000
tree 8022ee81004ed34dc5c4f028b66eb2f1bad76a52
parent 5f145630d5992b4db2da95a46cb3b75cc2f89089
parent 6e3b57f458cae7bb492abbc28c586f83f56e0a14

Merge "PRODUCT_TREBLE_LINKER_NAMESPACES for ld.config.txt" am: c437e14c17
am: 5bd7b32c15

Change-Id: I0958fea7b320025bb329defe2d26a922e7f236bb

rootdir/Android.mk

diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index fce3157..aa970d6 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -247,7 +247,7 @@
 else # if _enforce_vndk_at_runtime is not true
 
 LOCAL_MODULE := ld.config.txt
-ifeq ($(PRODUCT_FULL_TREBLE)|$(SANITIZE_TARGET),true|)
+ifeq ($(PRODUCT_TREBLE_LINKER_NAMESPACES)|$(SANITIZE_TARGET),true|)
 LOCAL_SRC_FILES := etc/ld.config.txt
 else
 LOCAL_SRC_FILES := etc/ld.config.legacy.txt