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

Commit 577aa720 authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Merge "Use sanitizer paths exported by make" am: 86b6db0b am: 3a901a46 am: 9fe8cab1 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1990491

Change-Id: Ibd20858e09c7398736f1585e9b39b221e89e92e1
parents 43062073 9fe8cab1

rootdir/Android.mk

+3 −9
Original line number Diff line number Diff line
@@ -199,15 +199,9 @@ LOCAL_MODULE_CLASS := ETC 
LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)

LOCAL_MODULE_STEM := $(LOCAL_MODULE)

include $(BUILD_SYSTEM)/base_rules.mk

$(LOCAL_BUILT_MODULE): PRIVATE_SANITIZER_RUNTIME_LIBRARIES := $(addsuffix .so,\

  $(ADDRESS_SANITIZER_RUNTIME_LIBRARY) \

  $(HWADDRESS_SANITIZER_RUNTIME_LIBRARY) \

  $(UBSAN_RUNTIME_LIBRARY) \

  $(TSAN_RUNTIME_LIBRARY) \

  $(2ND_ADDRESS_SANITIZER_RUNTIME_LIBRARY) \

  $(2ND_HWADDRESS_SANITIZER_RUNTIME_LIBRARY) \

  $(2ND_UBSAN_RUNTIME_LIBRARY) \

  $(2ND_TSAN_RUNTIME_LIBRARY))

$(LOCAL_BUILT_MODULE): PRIVATE_SANITIZER_RUNTIME_LIBRARIES := \

    $(SANITIZER_STEMS) \

    $(2ND_SANITIZER_STEMS)

$(LOCAL_BUILT_MODULE):

	@echo "Generate: $@"

	@mkdir -p $(dir $@)