r600: android: amdgpu_common is only required when building OpenCL
v2: split off Android changes Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
parent
311c091658
commit
d41b7b0104
|
@ -30,11 +30,7 @@ include $(CLEAR_VARS)
|
||||||
|
|
||||||
LOCAL_SRC_FILES := $(C_SOURCES) $(CXX_SOURCES)
|
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
|
LOCAL_C_INCLUDES += $(MESA_TOP)/src/amd/common
|
||||||
endif
|
|
||||||
|
|
||||||
LOCAL_SHARED_LIBRARIES := libdrm_radeon
|
LOCAL_SHARED_LIBRARIES := libdrm_radeon
|
||||||
LOCAL_MODULE := libmesa_pipe_r600
|
LOCAL_MODULE := libmesa_pipe_r600
|
||||||
|
@ -55,7 +51,6 @@ include $(BUILD_STATIC_LIBRARY)
|
||||||
ifneq ($(HAVE_GALLIUM_R600),)
|
ifneq ($(HAVE_GALLIUM_R600),)
|
||||||
$(eval GALLIUM_LIBS += \
|
$(eval GALLIUM_LIBS += \
|
||||||
$(LOCAL_MODULE) \
|
$(LOCAL_MODULE) \
|
||||||
$(LOCAL_STATIC_LIBRARIES) \
|
|
||||||
libmesa_winsys_radeon)
|
libmesa_winsys_radeon)
|
||||||
$(eval GALLIUM_SHARED_LIBS += $(LOCAL_SHARED_LIBRARIES))
|
$(eval GALLIUM_SHARED_LIBS += $(LOCAL_SHARED_LIBRARIES))
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Reference in New Issue