From e68259848046a68c74aa290f35c05d2045fa5ffc Mon Sep 17 00:00:00 2001 From: Simon Shi Date: Sat, 9 Mar 2019 00:57:04 +0800 Subject: prebuilt: Support ubsan libraries of all architectures According to the file under './prebuilts/clang/host/linux-x86/clang-4691093/lib64/clang/6.0.2/lib/linux/*.so', these files are supported under different target architectures. This commit would add support to every architecture. Change-Id: I1f88bc06c3f30e6d2f2083ba9b6350b2376d83f2 --- prebuilt/Android.mk | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk index de8287937..a7208a228 100644 --- a/prebuilt/Android.mk +++ b/prebuilt/Android.mk @@ -362,6 +362,21 @@ ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 27; echo $$?),0) ifeq ($(TARGET_ARCH), arm64) RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libclang_rt.ubsan_standalone-aarch64-android.so endif + ifeq ($(TARGET_ARCH), arm) + RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libclang_rt.ubsan_standalone-arm-android.so + endif + ifeq ($(TARGET_ARCH), x86_64) + RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libclang_rt.ubsan_standalone-x86_64-android.so + endif + ifeq ($(TARGET_ARCH), x86) + RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libclang_rt.ubsan_standalone-i686-android.so + endif + ifeq ($(TARGET_ARCH), mips) + RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libclang_rt.ubsan_standalone-mips-android.so + endif + ifeq ($(TARGET_ARCH), mips64) + RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libclang_rt.ubsan_standalone-mips64-android.so + endif RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/liblogwrap.so RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libext2_misc.so endif -- cgit v1.2.3