From 96b592696f13be09621bc50be31a89fde54b18e2 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Fri, 6 Sep 2019 09:50:32 +0200 Subject: gallium: Require LLVM >= 3.9 To go any further than this would be to break the current version of Android. Reviewed-by: Timothy Arceri Reviewed-by: Jose Fonseca --- Android.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'Android.mk') 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 -- cgit v1.2.3