X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=Android.mk;h=ab6bf6adbd4868565e6369edf3ab35ccd1373e66;hb=f790d6e0b48ca35291f50aeb7462130723d62870;hp=600b37a52e62fa455e389f51e8297142a04891b3;hpb=26aee6f4d5a28350e1f6becfc485ce929c4126f9;p=mesa.git

diff --git a/Android.mk b/Android.mk
index 600b37a52e6..ab6bf6adbd4 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