From d41b7b0104822534497a7a2f0b9ad011eb26c14f Mon Sep 17 00:00:00 2001 From: Jan Vesely Date: Fri, 2 Jun 2017 12:37:06 -0400 Subject: [PATCH] r600: android: amdgpu_common is only required when building OpenCL v2: split off Android changes Signed-off-by: Jan Vesely Reviewed-by: Emil Velikov --- src/gallium/drivers/r600/Android.mk | 5 ----- 1 file changed, 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 -- 2.30.2