commit 5bd7b32c156f344a5cd61608cbba239dee9fb00b
author Steven Moreland <smoreland@google.com> Mon Nov 13 21:11:17 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Nov 13 21:11:17 2017 +0000
tree 8a30d70531f3db5e480fed33dd69c9bd485f2e33
parent 3f958ed6413e075a876a53ac599df975cd04db46
parent c437e14c179c2df426fb711a704d7d39bf8f1b19

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

Change-Id: I7fbdb7ad974663beef8f4a985bbd281228f3230c

rootdir/Android.mk

diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index f75036d..d4de0ba 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