commit eff335d8509950cc3bc2901e2c982535be85b6f1
author lambdadroid <lambdadroid@gmail.com> Wed Sep 26 22:42:05 2018 +0200
committer Dees Troy <dees_troy@teamw.in> Mon Mar 18 18:17:16 2019 +0100
tree f889e13dc5386c59ea38414d6133a55e38b14dcf
parent d32b7ebf20217f5053aaf0597cc1a7dcf86fc2a5

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

diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index f792042..26ee594 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -346,7 +346,9 @@
     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