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

am: 5bd7b32c15

Change-Id: I0958fea7b320025bb329defe2d26a922e7f236bb
This commit is contained in:
Steven Moreland 2017-11-13 21:13:50 +00:00 committed by android-build-merger
commit 2c531b007e
1 changed files with 1 additions and 1 deletions

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