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

am: 2c531b007e

Change-Id: Iee1ac7081e7954099e9ee77c07480e8db30adb67
This commit is contained in:
Steven Moreland 2017-11-13 21:19:21 +00:00 committed by android-build-merger
commit 2eaa098bfe

View file

@ -241,7 +241,7 @@ sanitizer_runtime_libraries :=
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