Mesa (master): Android: Add LLVM support for Android O

[Emil Velikov]

Module: Mesa
Branch: master
Commit: d31a2b4d49274ca362097a9707d9e9a48ea58063
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d31a2b4d49274ca362097a9707d9e9a48ea58063

Author: Rob Herring <robh at kernel.org>
Date:   Wed May  3 14:35:25 2017 -0500

Android: Add LLVM support for Android O

Android O moves to LLVM 3.9 and also has some differences in header
dependencies as LLVM has moved to blueprint files. It seems libLLVMCore
was only needed for header dependencies, so we can drop that for O.

Signed-off-by: Rob Herring <robh at kernel.org>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>

---

 Android.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Android.mk b/Android.mk
index 600b37a52e..ab6bf6adbd 100644
--- a/Android.mk
+++ b/Android.mk
@@ -92,7 +92,10 @@ define mesa-build-with-llvm
   $(if $(filter 7,$(MESA_ANDROID_MAJOR_VERSION)), \
     $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0308 -DMESA_LLVM_VERSION_PATCH=0) \
     $(eval LOCAL_STATIC_LIBRARIES += libLLVMCore) \
-    $(eval LOCAL_C_INCLUDES += external/llvm/include external/llvm/device/include),)
+    $(eval LOCAL_C_INCLUDES += external/llvm/include external/llvm/device/include),) \
+  $(if $(filter O,$(MESA_ANDROID_MAJOR_VERSION)), \
+    $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0309 -DMESA_LLVM_VERSION_PATCH=0) \
+    $(eval LOCAL_HEADER_LIBRARIES += llvm-headers),)
 endef
 
 # add subdirectories