diff options
| author | Rob Herring <[email protected]> | 2017-05-03 14:35:24 -0500 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-05-11 13:52:21 +0100 |
| commit | 26aee6f4d5a28350e1f6becfc485ce929c4126f9 (patch) | |
| tree | 2c1cc45feae6fc8dec6e3da62de74f4891db8293 /src/gallium/auxiliary/Android.mk | |
| parent | e2ff12e919b5f887083225d96f4060a122c12eab (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 <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/gallium/auxiliary/Android.mk')
| -rw-r--r-- | src/gallium/auxiliary/Android.mk | 8 |
1 files changed, 4 insertions, 4 deletions
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 |