summaryrefslogtreecommitdiff
path: root/Android.mk
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2019-09-06 09:50:32 +0200
committerAdam Jackson <ajax@nwnk.net>2019-09-11 17:00:43 +0000
commit96b592696f13be09621bc50be31a89fde54b18e2 (patch)
treea935e5c82f0644bbaaa3b3bdcf0e19611fd2c866 /Android.mk
parent585d0956108b82514b3cb842642f8a3f23301ca1 (diff)
gallium: Require LLVM >= 3.9
To go any further than this would be to break the current version of Android. Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com> Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk9
1 files changed, 2 insertions, 7 deletions
diff --git a/Android.mk b/Android.mk
index c7c28885995..df379a40528 100644
--- a/Android.mk
+++ b/Android.mk
@@ -95,14 +95,9 @@ MESA_ENABLE_LLVM := true
endif
define mesa-build-with-llvm
- $(if $(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5 6), \
+ $(if $(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5 6 7), \
$(warning Unsupported LLVM version in Android $(MESA_ANDROID_MAJOR_VERSION)),) \
- $(if $(filter 7,$(MESA_ANDROID_MAJOR_VERSION)), \
- $(eval LOCAL_CFLAGS += -DLLVM_AVAILABLE -DMESA_LLVM_VERSION_STRING=\"3.8\")) \
- $(if $(filter 8,$(MESA_ANDROID_MAJOR_VERSION)), \
- $(eval LOCAL_CFLAGS += -DLLVM_AVAILABLE -DMESA_LLVM_VERSION_STRING=\"3.9\")) \
- $(if $(filter P,$(MESA_ANDROID_MAJOR_VERSION)), \
- $(eval LOCAL_CFLAGS += -DLLVM_AVAILABLE -DMESA_LLVM_VERSION_STRING=\"3.9\")) \
+ $(eval LOCAL_CFLAGS += -DLLVM_AVAILABLE -DMESA_LLVM_VERSION_STRING=\"3.9\")
$(eval LOCAL_SHARED_LIBRARIES += libLLVM)
endef