From d31a2b4d49274ca362097a9707d9e9a48ea58063 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Wed, 3 May 2017 14:35:25 -0500 Subject: [PATCH] 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 Reviewed-by: Emil Velikov --- Android.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 -- 2.30.2