v2: split off Android changes
Signed-off-by: Jan Vesely <jan.ves...@rutgers.edu>
---
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 87f433d..18c5bb6 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
@@ -45,7 +41,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.9.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
