From 7db0bf8b31bf7839c7644cb2b640406fa2e61da0 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Wed, 23 Aug 2017 12:20:52 -0500 Subject: [PATCH] Android: fix Android O version check for LLVM With the release of O, the MESA_ANDROID_MAJOR_VERSION has changed to 8. Change the LLVM check to match. There's no point to continue to support 'O' as no one is going to use an old AOSP master. Presumably, we'll be back here again to fix things again for P (or 9). Reviewed-by: Chih-Wei Huang Signed-off-by: Rob Herring --- Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Android.mk b/Android.mk index 7087a44a9c3..e03eb716123 100644 --- a/Android.mk +++ b/Android.mk @@ -95,7 +95,7 @@ define mesa-build-with-llvm $(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 O,$(MESA_ANDROID_MAJOR_VERSION)), \ + $(if $(filter 8,$(MESA_ANDROID_MAJOR_VERSION)), \ $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0309 -DMESA_LLVM_VERSION_PATCH=0)) \ $(eval LOCAL_SHARED_LIBRARIES += libLLVM) endef -- 2.30.2