Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2eaa098b authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "PRODUCT_TREBLE_LINKER_NAMESPACES for ld.config.txt" am: c437e14c am: 5bd7b32c 

am: 2c531b00

Change-Id: Iee1ac7081e7954099e9ee77c07480e8db30adb67
parents 16a72c83 2c531b00

rootdir/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -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