AArch64: Temporarily disable AArch64 build

This patch disables AArch64 build and will get us going with
building bionic. Needs to be reverted once upstream llvm support is
integrated into AOSP (AArch64 backend).

Change-Id: I4dde21bc340d7d00d5ffda551db2e5ab83c85c63
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>

diff --git a/shared_llvm.mk b/shared_llvm.mk
index 9519cbe..26e4090 100644 (file)
--- a/shared_llvm.mk
+++ b/shared_llvm.mk
@@ -81,7 +81,8 @@ endif
 include $(LLVM_HOST_BUILD_MK)
 include $(BUILD_HOST_SHARED_LIBRARY)
 
-
+#TODOAArch64: Enable llvm build
+ifneq ($(TARGET_ARCH),aarch64)
 # DEVICE LLVM shared library build
 include $(CLEAR_VARS)
 
@@ -115,4 +116,6 @@ LOCAL_SHARED_LIBRARIES := libcutils libdl libstlport
 include $(LLVM_DEVICE_BUILD_MK)
 include $(BUILD_SHARED_LIBRARY)
 
+endif # !aarch64
+
 endif # don't build in unbundled branches

diff --git a/tools/llc/Android.mk b/tools/llc/Android.mk
index bc19e9b..74015f0 100644 (file)
--- a/tools/llc/Android.mk
+++ b/tools/llc/Android.mk
@@ -91,6 +91,8 @@ include $(BUILD_HOST_EXECUTABLE)
 # llc command line tool (target)
 #===---------------------------------------------------------------===
 
+#TODOAArch64: Enable llc build
+ifneq ($(TARGET_ARCH),aarch64)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := llc
@@ -125,3 +127,5 @@ include $(LLVM_ROOT_PATH)/llvm.mk
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_EXECUTABLE)
+
+endif # !aarch64