From: Rob Herring <robh@kernel.org>
Date: Wed, 23 Aug 2017 17:20:52 +0000 (-0500)
Subject: Android: fix Android O version check for LLVM
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7db0bf8b31bf7839c7644cb2b640406fa2e61da0;p=mesa.git

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 <cwhuang@linux.org.tw>
Signed-off-by: Rob Herring <robh@kernel.org>
---

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