android: winsys/amdgpu,radv: fix generated amdgfxregs.h header dependecies

Fix android building errors in winsys/amdgpu and radv
due to 'amdgfxregs.h' not found.

Changelog:
amd/common - generated $(intermediated)/common path is added to exports
winsys/amdgpu - libmesa_amd_common static dependency is added
radv - correct generated $(intermediated)/common path is added to includes

Fixes: f480b8a ("amd/common: use generated register header")
Signed-off-by: Mauro Rossi <issor.oruam@gmail.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>

diff --git a/src/amd/Android.common.mk b/src/amd/Android.common.mk
index 54180f16bbab2a2df249176ba46d838f11dcadbe..1a3a00b9bc6b552ec5f0ebc5bd207744d4c16921 100644 (file)
--- a/src/amd/Android.common.mk
+++ b/src/amd/Android.common.mk
@@ -62,7 +62,8 @@ LOCAL_C_INCLUDES := \
        $(intermediates)/common
 
 LOCAL_EXPORT_C_INCLUDE_DIRS := \
        $(intermediates)/common
 
 LOCAL_EXPORT_C_INCLUDE_DIRS := \

-       $(LOCAL_PATH)/common
+       $(LOCAL_PATH)/common \
+       $(intermediates)/common

 
 LOCAL_SHARED_LIBRARIES := \
        libdrm_amdgpu
 
 LOCAL_SHARED_LIBRARIES := \
        libdrm_amdgpu

diff --git a/src/amd/vulkan/Android.mk b/src/amd/vulkan/Android.mk
index ab39ba3b7238081fd42ca5c0cc6b3db86805a31a..0725feacb5651d576f6c86128e1b4b77a9a0e733 100644 (file)
--- a/src/amd/vulkan/Android.mk
+++ b/src/amd/vulkan/Android.mk
@@ -68,7 +68,7 @@ $(call mesa-build-with-llvm)
 
 LOCAL_C_INCLUDES := \
        $(RADV_COMMON_INCLUDES) \
 
 LOCAL_C_INCLUDES := \
        $(RADV_COMMON_INCLUDES) \

-       $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_amd_common,,) \
+       $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_amd_common,,)/common \

        $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_nir,,)/nir \
        $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_radv_common,,) \
        $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_vulkan_util,,)/util \
        $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_nir,,)/nir \
        $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_radv_common,,) \
        $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_vulkan_util,,)/util \

diff --git a/src/gallium/winsys/amdgpu/drm/Android.mk b/src/gallium/winsys/amdgpu/drm/Android.mk
index 6e84a0c8de1a8e503ef4e1551e823383e7150a66..0b8edf972dcbb2ee98c693df252bc57080f9f732 100644 (file)
--- a/src/gallium/winsys/amdgpu/drm/Android.mk
+++ b/src/gallium/winsys/amdgpu/drm/Android.mk
@@ -32,7 +32,7 @@ LOCAL_SRC_FILES := $(C_SOURCES)
 
 LOCAL_CFLAGS := $(AMDGPU_CFLAGS)
 
 
 LOCAL_CFLAGS := $(AMDGPU_CFLAGS)
 

-LOCAL_STATIC_LIBRARIES := libmesa_amdgpu_addrlib
+LOCAL_STATIC_LIBRARIES := libmesa_amdgpu_addrlib libmesa_amd_common

 
 LOCAL_SHARED_LIBRARIES := libdrm_amdgpu
 LOCAL_MODULE := libmesa_winsys_amdgpu
 
 LOCAL_SHARED_LIBRARIES := libdrm_amdgpu
 LOCAL_MODULE := libmesa_winsys_amdgpu