diff options
| author | Jan Vesely <jan.vesely@rutgers.edu> | 2017-06-02 12:37:06 -0400 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2017-06-16 12:41:44 +0100 |
| commit | d41b7b0104822534497a7a2f0b9ad011eb26c14f (patch) | |
| tree | 3c5a86e9a5ac1468ce8091a73998c844d6d7ce3e /src/gallium/drivers/r600 | |
| parent | 311c09165881111c4a596ca7e7b4bce89b059e0f (diff) | |
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>
Diffstat (limited to 'src/gallium/drivers/r600')
| -rw-r--r-- | src/gallium/drivers/r600/Android.mk | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/gallium/drivers/r600/Android.mk b/src/gallium/drivers/r600/Android.mk index fa62613d1d..2d89f49cd5 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 |