diff options
| author | Elliott Hughes <enh@google.com> | 2014-02-06 20:47:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-06 20:47:42 +0000 |
| commit | 1fb20b43c912416e9f9696366235a091d2acfc65 (patch) | |
| tree | 5f1680e45d0adeed4d3b49f0eac7d393c4787c71 /shared_llvm.mk | |
| parent | e5c96aeb8d9c9551bbe6e3fa3d6a58538865dc7d (diff) | |
| parent | edba52bcd1a8afc5277a747727eae63023f18949 (diff) | |
| download | external_llvm-1fb20b43c912416e9f9696366235a091d2acfc65.zip external_llvm-1fb20b43c912416e9f9696366235a091d2acfc65.tar.gz external_llvm-1fb20b43c912416e9f9696366235a091d2acfc65.tar.bz2 | |
am edba52bc: Merge "[MIPS64] Temporary placeholder build, to allow other projects to build"
* commit 'edba52bcd1a8afc5277a747727eae63023f18949':
[MIPS64] Temporary placeholder build, to allow other projects to build
Diffstat (limited to 'shared_llvm.mk')
| -rw-r--r-- | shared_llvm.mk | 5 |
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 |