Merge "PRODUCT_TREBLE_LINKER_NAMESPACES for ld.config.txt"

am: c437e14c17

Change-Id: I7fbdb7ad974663beef8f4a985bbd281228f3230c
This commit is contained in:
Steven Moreland 2017-11-13 21:11:17 +00:00 committed by android-build-merger
commit 5bd7b32c15

View file

@ -247,7 +247,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