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/auxiliary/Android.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/gallium/auxiliary/Android.mk') diff --git a/src/gallium/auxiliary/Android.mk b/src/gallium/auxiliary/Android.mk index 4f6f71bbf6a..e2a1fc214eb 100644 --- a/src/gallium/auxiliary/Android.mk +++ b/src/gallium/auxiliary/Android.mk @@ -38,12 +38,12 @@ LOCAL_C_INCLUDES := \ ifeq ($(MESA_ENABLE_LLVM),true) LOCAL_SRC_FILES += \ - $(GALLIVM_SOURCES) \ - $(GALLIVM_CPP_SOURCES) -LOCAL_STATIC_LIBRARIES += libLLVMCore -LOCAL_CPPFLAGS := -std=c++11 + $(GALLIVM_SOURCES) +$(call mesa-build-with-llvm) endif +LOCAL_CPPFLAGS += -std=c++11 + # We need libmesa_nir to get NIR's generated include directories. LOCAL_MODULE := libmesa_gallium LOCAL_STATIC_LIBRARIES += libmesa_nir -- cgit v1.2.3