From 21527e979447a30186da3aeaaa3bbd6a6629f48d Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 17 Feb 2022 11:19:48 -0800 Subject: [PATCH] Use sanitizer paths exported by make The clang prebuilts now provide a single module with per-architecture variants instead of a module per architecture, which means the module name doesn't match the installed file name. Use the file names exported from Soong instead of the module names. Bug: 220019988 Test: m out/target/produuct/coral/system/etc/sanitizer.libraries.txt Change-Id: I12e7e988ce60d928987db8611883e67f2ecdee87 --- rootdir/Android.mk | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/rootdir/Android.mk b/rootdir/Android.mk index d59236641..20eaf3e11 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -197,15 +197,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 $@)