commit 5ad44cac0caec42c7371a3a79a78940cde899fc1
author Steven Moreland <smoreland@google.com> Mon Nov 13 21:19:21 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Nov 13 21:19:21 2017 +0000
tree 518c66524bd18b04a6f6cd1030e6ecdb53c641a5
parent d991e8b790e47a619a6b2a76516570a43a55b1d6
parent b9c03dd878bb089b72b13ed8e8f874c789cdf2be

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

Change-Id: Iee1ac7081e7954099e9ee77c07480e8db30adb67

rootdir/Android.mk

diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index 6aadf9e..560092e 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -241,7 +241,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