summaryrefslogtreecommitdiff
path: root/src/gallium/Android.common.mk
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2017-05-03 14:35:24 -0500
committerEmil Velikov <emil.l.velikov@gmail.com>2017-05-11 13:52:21 +0100
commit26aee6f4d5a28350e1f6becfc485ce929c4126f9 (patch)
tree2c1cc45feae6fc8dec6e3da62de74f4891db8293 /src/gallium/Android.common.mk
parente2ff12e919b5f887083225d96f4060a122c12eab (diff)
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 <robh@kernel.org> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Diffstat (limited to 'src/gallium/Android.common.mk')
-rw-r--r--src/gallium/Android.common.mk6
1 files changed, 0 insertions, 6 deletions
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)