From 26aee6f4d5a28350e1f6becfc485ce929c4126f9 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Wed, 3 May 2017 14:35:24 -0500 Subject: Android: rework LLVM build support Currently, building with "mmma external/mesa3d" which builds all targets and dependencies is broken for targets that require LLVM. This is due to the build settings depending on MESA_ENABLE_LLVM. Instead of using a conditional in the global Android.common.mk, make all the components that need LLVM explicitly include the necessary build settings. GALLIVM_CPP_SOURCES doesn't exist anymore, so remove that as well. Signed-off-by: Rob Herring Reviewed-by: Emil Velikov --- src/gallium/Android.common.mk | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/gallium/Android.common.mk') diff --git a/src/gallium/Android.common.mk b/src/gallium/Android.common.mk index b2eb95bcd64..782510ff0f4 100644 --- a/src/gallium/Android.common.mk +++ b/src/gallium/Android.common.mk @@ -29,10 +29,4 @@ LOCAL_C_INCLUDES += \ $(GALLIUM_TOP)/winsys \ $(GALLIUM_TOP)/drivers -ifeq ($(MESA_ENABLE_LLVM),true) -LOCAL_C_INCLUDES += \ - external/llvm/include \ - external/llvm/device/include -endif - include $(MESA_COMMON_MK) -- cgit v1.2.3