From eff335d8509950cc3bc2901e2c982535be85b6f1 Mon Sep 17 00:00:00 2001 From: lambdadroid Date: Wed, 26 Sep 2018 22:42:05 +0200 Subject: prebuilt: Avoid re-linking ARM64 specific library on other architectures libclang_rt.ubsan_standalone-aarch64-android.so is a library for arm64 and is therefore not available on other architectures, causing the build to fail because there is no rule to build it. Change-Id: Ia4af38f42ba46a233d40e936d43e4c97c449d059 --- prebuilt/Android.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk index f79204208..26ee594c1 100644 --- a/prebuilt/Android.mk +++ b/prebuilt/Android.mk @@ -346,7 +346,9 @@ ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 25; echo $$?),0) endif endif ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 27; echo $$?),0) - RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libclang_rt.ubsan_standalone-aarch64-android.so + ifeq ($(TARGET_ARCH), arm64) + RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libclang_rt.ubsan_standalone-aarch64-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