aboutsummaryrefslogtreecommitdiffstats
path: root/shared_llvm.mk
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-02-06 20:40:37 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-02-06 20:40:37 +0000
commitedba52bcd1a8afc5277a747727eae63023f18949 (patch)
tree5f1680e45d0adeed4d3b49f0eac7d393c4787c71 /shared_llvm.mk
parent94af5fd9ff423e4de67a23ca21d5964b82a3816a (diff)
parenta255939b6afb5a83473fee8658281b736b80f9f2 (diff)
downloadexternal_llvm-edba52bcd1a8afc5277a747727eae63023f18949.zip
external_llvm-edba52bcd1a8afc5277a747727eae63023f18949.tar.gz
external_llvm-edba52bcd1a8afc5277a747727eae63023f18949.tar.bz2
Merge "[MIPS64] Temporary placeholder build, to allow other projects to build"
Diffstat (limited to 'shared_llvm.mk')
-rw-r--r--shared_llvm.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/shared_llvm.mk b/shared_llvm.mk
index 0a438a2..718afb3 100644
--- a/shared_llvm.mk
+++ b/shared_llvm.mk
@@ -82,7 +82,8 @@ include $(LLVM_HOST_BUILD_MK)
include $(BUILD_HOST_SHARED_LIBRARY)
#TODOArm64: Enable llvm build
-ifneq ($(TARGET_ARCH),arm64)
+#TODOMips64: Enable llvm build
+ifeq ($(filter $(TARGET_ARCH),arm64 mips64),)
# DEVICE LLVM shared library build
include $(CLEAR_VARS)
@@ -116,6 +117,6 @@ LOCAL_SHARED_LIBRARIES := libcutils libdl libstlport
include $(LLVM_DEVICE_BUILD_MK)
include $(BUILD_SHARED_LIBRARY)
-endif # !arm64
+endif # !(arm64 || mips64)
endif # don't build in unbundled branches