aboutsummaryrefslogtreecommitdiffstats
path: root/shared_llvm.mk
diff options
context:
space:
mode:
authorBen Cheng <bccheng@android.com>2013-12-11 21:09:53 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2013-12-11 21:09:53 +0000
commit6562c95b5280bc16c4db31d58a6cae8e5cdfde6d (patch)
tree855df3ba90391ae43400e8146ceee50547553523 /shared_llvm.mk
parent0de283dfa2686e30b44a3f6d7ce081588bf4910f (diff)
parent0000ef0b7a446ff64de480da75b353c3ad0ff196 (diff)
downloadexternal_llvm-6562c95b5280bc16c4db31d58a6cae8e5cdfde6d.zip
external_llvm-6562c95b5280bc16c4db31d58a6cae8e5cdfde6d.tar.gz
external_llvm-6562c95b5280bc16c4db31d58a6cae8e5cdfde6d.tar.bz2
am 0000ef0b: Merge "AArch64: Temporarily disable AArch64 build"
* commit '0000ef0b7a446ff64de480da75b353c3ad0ff196': AArch64: Temporarily disable AArch64 build
Diffstat (limited to 'shared_llvm.mk')
-rw-r--r--shared_llvm.mk5
1 files changed, 4 insertions, 1 deletions
diff --git a/shared_llvm.mk b/shared_llvm.mk
index 8e20092..155b72e 100644
--- a/shared_llvm.mk
+++ b/shared_llvm.mk
@@ -91,7 +91,8 @@ include $(LLVM_HOST_BUILD_MK)
include $(BUILD_HOST_SHARED_LIBRARY)
endif
-
+#TODOAArch64: Enable llvm build
+ifneq ($(TARGET_ARCH),aarch64)
# DEVICE LLVM shared library build
include $(CLEAR_VARS)
@@ -125,4 +126,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