commit 0ba2d2652549b10e7a6269c41cfd29afd81dc324
author Rob Herring <robh@kernel.org> Thu Sep 07 15:31:26 2017 -0500
committer Rob Herring <robh@kernel.org> Mon Sep 11 09:35:23 2017 -0500
tree fc406f0b815231d6d6149fcfcf0af556537a9d2d
parent af726a1e2ca30a7cbd95319ad24aab8d9c6a855e

Android: Add LLVM support for Android P

The Android version in AOSP master has changed now to P, so we need to add
LLVM flags for it. Duplicating the lines because I expect the version will
get bumped at some point and diverge from O.

Cc: Chih-Wei Huang <cwhuang@android-x86.org>
Signed-off-by: Rob Herring <robh@kernel.org>

Android.mk

diff --git a/Android.mk b/Android.mk
index e03eb71..9dc0bbd 100644
--- a/Android.mk
+++ b/Android.mk
@@ -97,6 +97,8 @@
     $(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)) \
+  $(if $(filter P,$(MESA_ANDROID_MAJOR_VERSION)), \
+    $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0309 -DMESA_LLVM_VERSION_PATCH=0)) \
   $(eval LOCAL_SHARED_LIBRARIES += libLLVM)
 endef