From: Emil Velikov <emil.veli...@collabora.com>
Mauro has a handful of branches for Android 8 (Oreo) onward.
Cc: Mauro Rossi <issor.or...@gmail.com>
Cc: Rob Herring <r...@kernel.org>
---
AFAICS Mauro has branches for 5.0, 6.0 and 7.0. Using either one
requires manual intervention. Namely: change the HAVE_LLVM + libname
in this file.
Personally, would jump the 7.0 train and omit the others ;-)
That aside, some tips how to handle this better will be appreciated.
---
Android.mk | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/Android.mk b/Android.mk
index 914854c27d6..13ca3265a80 100644
--- a/Android.mk
+++ b/Android.mk
@@ -64,6 +64,7 @@ gallium_drivers := \
ifeq ($(BOARD_GPU_DRIVERS),all)
MESA_BUILD_CLASSIC := $(filter HAVE_%, $(subst ., , $(classic_drivers)))
+# XXX: tweak the following list to include LLVM requiring drivers only where
LLVM is new enough?
MESA_BUILD_GALLIUM := $(filter HAVE_%, $(subst ., , $(gallium_drivers)))
else
# Warn if we have any invalid driver names
@@ -94,16 +95,12 @@ MESA_ENABLE_LLVM := true
endif
define mesa-build-with-llvm
- $(if $(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5), \
+ $(if $(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5 6 7), \
$(warning Unsupported LLVM version in Android
$(MESA_ANDROID_MAJOR_VERSION)),) \
- $(if $(filter 6,$(MESA_ANDROID_MAJOR_VERSION)), \
- $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0307 -DMESA_LLVM_VERSION_PATCH=0)) \
- $(if $(filter 7,$(MESA_ANDROID_MAJOR_VERSION)), \
- $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0308 -DMESA_LLVM_VERSION_PATCH=0)) \
$(if $(filter 8,$(MESA_ANDROID_MAJOR_VERSION)), \
- $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0309 -DMESA_LLVM_VERSION_PATCH=0)) \
+ $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0500 -DMESA_LLVM_VERSION_PATCH=1)) \
$(if $(filter P,$(MESA_ANDROID_MAJOR_VERSION)), \
- $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0309 -DMESA_LLVM_VERSION_PATCH=0)) \
+ $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0500 -DMESA_LLVM_VERSION_PATCH=1)) \
$(eval LOCAL_SHARED_LIBRARIES += libLLVM)
endef
--
2.19.1
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
