[Mesa-dev] [PATCH] android: radeon(s): fix libdrm_amdgpu shared dependencies

[Mauro Rossi]

Fixes building errors in radeon drivers and winsys:

target  C: libmesa_amd_common <= external/mesa/src/amd/common/ac_gpu_info.c
...
target  C: libmesa_amd_common <= external/mesa/src/amd/common/ac_surface.c
...
target  C: libmesa_pipe_r300 <= external/mesa/src/gallium/drivers/r300/r300_blit.c
...
target  C: libmesa_pipe_r300 <= external/mesa/src/gallium/drivers/r300/r300_context.c
...
target  C: libmesa_pipe_r300 <= external/mesa/src/gallium/drivers/r300/r300_chipset.c
...
target  C: libmesa_pipe_r300 <= external/mesa/src/gallium/drivers/r300/r300_debug.c
...
target  C: libmesa_pipe_radeon <= external/mesa/src/gallium/drivers/radeon/cayman_msaa.c
...
target  C++: libmesa_pipe_r600 <= external/mesa/src/gallium/drivers/r600/sb/sb_bc_parser.cpp
...
target  C++: libmesa_pipe_r600 <= external/mesa/src/gallium/drivers/r600/sb/sb_core.cpp
...
target  C: libmesa_pipe_radeonsi <= external/mesa/src/gallium/drivers/radeonsi/si_blit.c
...
target  C: libmesa_pipe_radeonsi <= external/mesa/src/gallium/drivers/radeonsi/cik_sdma.c
...
target  C: libmesa_winsys_radeon <= external/mesa/src/gallium/winsys/radeon/drm/radeon_drm_cs.c
...
target  C: libmesa_winsys_radeon <= external/mesa/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
...
target  C: libmesa_winsys_radeon <= external/mesa/src/gallium/winsys/radeon/drm/radeon_drm_surface.c
...

external/mesa/src/amd/common/ac_gpu_info.h:31:10: fatal error: 'amdgpu.h' file not found
         ^
14 errors

Fixes: 98a2492 "ac_surface: use radeon_info from ac_gpu_info"
---
 src/amd/Android.common.mk                | 3 +++
 src/gallium/drivers/r300/Android.mk      | 2 +-
 src/gallium/drivers/r600/Android.mk      | 2 +-
 src/gallium/drivers/radeon/Android.mk    | 2 +-
 src/gallium/drivers/radeonsi/Android.mk  | 2 +-
 src/gallium/winsys/radeon/drm/Android.mk | 2 +-
 6 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/amd/Android.common.mk b/src/amd/Android.common.mk
index e3915b45bf..39d2732fd9 100644
--- a/src/amd/Android.common.mk
+++ b/src/amd/Android.common.mk
@@ -61,6 +61,9 @@ LOCAL_C_INCLUDES := \
 LOCAL_EXPORT_C_INCLUDE_DIRS := \
 	$(LOCAL_PATH)/common
 
+LOCAL_SHARED_LIBRARIES := \
+	libdrm_amdgpu
+
 LOCAL_STATIC_LIBRARIES := \
 	libmesa_nir
 
diff --git a/src/gallium/drivers/r300/Android.mk b/src/gallium/drivers/r300/Android.mk
index 0c89cdbb14..1867c702ea 100644
--- a/src/gallium/drivers/r300/Android.mk
+++ b/src/gallium/drivers/r300/Android.mk
@@ -35,7 +35,7 @@ LOCAL_C_INCLUDES := \
 	$(MESA_TOP)/src/mesa
 
 
-LOCAL_SHARED_LIBRARIES := libdrm_radeon
+LOCAL_SHARED_LIBRARIES := libdrm_radeon libdrm_amdgpu
 LOCAL_MODULE := libmesa_pipe_r300
 
 include $(GALLIUM_COMMON_MK)
diff --git a/src/gallium/drivers/r600/Android.mk b/src/gallium/drivers/r600/Android.mk
index 87f433dbae..9f5e1f127c 100644
--- a/src/gallium/drivers/r600/Android.mk
+++ b/src/gallium/drivers/r600/Android.mk
@@ -36,7 +36,7 @@ else
 LOCAL_C_INCLUDES += $(MESA_TOP)/src/amd/common
 endif
 
-LOCAL_SHARED_LIBRARIES := libdrm_radeon
+LOCAL_SHARED_LIBRARIES := libdrm_radeon libdrm_amdgpu
 LOCAL_MODULE := libmesa_pipe_r600
 
 include $(GALLIUM_COMMON_MK)
diff --git a/src/gallium/drivers/radeon/Android.mk b/src/gallium/drivers/radeon/Android.mk
index eb1a32182b..d433e97567 100644
--- a/src/gallium/drivers/radeon/Android.mk
+++ b/src/gallium/drivers/radeon/Android.mk
@@ -30,7 +30,7 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(C_SOURCES)
 
-LOCAL_SHARED_LIBRARIES := libdrm_radeon libLLVM
+LOCAL_SHARED_LIBRARIES := libdrm_radeon libdrm_amdgpu libLLVM
 LOCAL_MODULE := libmesa_pipe_radeon
 
 ifeq ($(MESA_ENABLE_LLVM),true)
diff --git a/src/gallium/drivers/radeonsi/Android.mk b/src/gallium/drivers/radeonsi/Android.mk
index 5676c55983..c08833e9dd 100644
--- a/src/gallium/drivers/radeonsi/Android.mk
+++ b/src/gallium/drivers/radeonsi/Android.mk
@@ -40,7 +40,7 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_STATIC_LIBRARIES := libmesa_amd_common
 
-LOCAL_SHARED_LIBRARIES := libdrm_radeon libLLVM
+LOCAL_SHARED_LIBRARIES := libdrm_radeon libdrm_amdgpu libLLVM
 LOCAL_MODULE := libmesa_pipe_radeonsi
 
 $(call mesa-build-with-llvm)
diff --git a/src/gallium/winsys/radeon/drm/Android.mk b/src/gallium/winsys/radeon/drm/Android.mk
index 2e0c40c066..80f981a317 100644
--- a/src/gallium/winsys/radeon/drm/Android.mk
+++ b/src/gallium/winsys/radeon/drm/Android.mk
@@ -30,7 +30,7 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(C_SOURCES)
 
-LOCAL_SHARED_LIBRARIES := libdrm_radeon
+LOCAL_SHARED_LIBRARIES := libdrm_radeon libdrm_amdgpu
 LOCAL_MODULE := libmesa_winsys_radeon
 
 include $(GALLIUM_COMMON_MK)
-- 
2.11.0