summaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorJan Vesely <[email protected]>2017-06-02 12:37:06 -0400
committerEmil Velikov <[email protected]>2017-06-16 12:41:44 +0100
commitd41b7b0104822534497a7a2f0b9ad011eb26c14f (patch)
tree3c5a86e9a5ac1468ce8091a73998c844d6d7ce3e /src/gallium
parent311c09165881111c4a596ca7e7b4bce89b059e0f (diff)
r600: android: amdgpu_common is only required when building OpenCL
v2: split off Android changes Signed-off-by: Jan Vesely <[email protected]> Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/drivers/r600/Android.mk5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/gallium/drivers/r600/Android.mk b/src/gallium/drivers/r600/Android.mk
index fa62613d1de..2d89f49cd5a 100644
--- a/src/gallium/drivers/r600/Android.mk
+++ b/src/gallium/drivers/r600/Android.mk
@@ -30,11 +30,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(C_SOURCES) $(CXX_SOURCES)
-ifeq ($(MESA_ENABLE_LLVM),true)
-LOCAL_STATIC_LIBRARIES := libmesa_amd_common
-else
LOCAL_C_INCLUDES += $(MESA_TOP)/src/amd/common
-endif
LOCAL_SHARED_LIBRARIES := libdrm_radeon
LOCAL_MODULE := libmesa_pipe_r600
@@ -55,7 +51,6 @@ include $(BUILD_STATIC_LIBRARY)
ifneq ($(HAVE_GALLIUM_R600),)
$(eval GALLIUM_LIBS += \
$(LOCAL_MODULE) \
- $(LOCAL_STATIC_LIBRARIES) \
libmesa_winsys_radeon)
$(eval GALLIUM_SHARED_LIBS += $(LOCAL_SHARED_LIBRARIES))
endif