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/drivers | |
| 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/drivers')
| -rw-r--r-- | src/gallium/drivers/radeon/Android.mk | 7 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/Android.mk | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/gallium/drivers/radeon/Android.mk b/src/gallium/drivers/radeon/Android.mk index 64815f6f084..eb1a32182bb 100644 --- a/src/gallium/drivers/radeon/Android.mk +++ b/src/gallium/drivers/radeon/Android.mk @@ -30,13 +30,14 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(C_SOURCES) +LOCAL_SHARED_LIBRARIES := libdrm_radeon libLLVM +LOCAL_MODULE := libmesa_pipe_radeon + ifeq ($(MESA_ENABLE_LLVM),true) LOCAL_CFLAGS += -DFORCE_BUILD_AMDGPU # instructs LLVM to declare LLVMInitializeAMDGPU* functions +$(call mesa-build-with-llvm) endif -LOCAL_SHARED_LIBRARIES := libdrm_radeon libLLVM -LOCAL_MODULE := libmesa_pipe_radeon - include $(GALLIUM_COMMON_MK) include $(BUILD_STATIC_LIBRARY) diff --git a/src/gallium/drivers/radeonsi/Android.mk b/src/gallium/drivers/radeonsi/Android.mk index cd768751518..5676c55983f 100644 --- a/src/gallium/drivers/radeonsi/Android.mk +++ b/src/gallium/drivers/radeonsi/Android.mk @@ -43,6 +43,8 @@ LOCAL_STATIC_LIBRARIES := libmesa_amd_common LOCAL_SHARED_LIBRARIES := libdrm_radeon libLLVM LOCAL_MODULE := libmesa_pipe_radeonsi +$(call mesa-build-with-llvm) + include $(GALLIUM_COMMON_MK) include $(BUILD_STATIC_LIBRARY) |