On 14.06.19 18:46, Mauro Rossi wrote: > Fix android building errors in winsys/amdgpu and radv > due to 'amdgfxregs.h' not found.
Thanks! Reviewed-by: Nicolai Hähnle <[email protected]> > > Changelog: > amd/common - generated $(intermediated)/common path is added to exports > winsys/amdgpu - libmesa_amd_common static dependency is added > radv - fix libmesa_amd_common $(intermediated)/common path in includes > > Fixes: f480b8a ("amd/common: use generated register header") > Signed-off-by: Mauro Rossi <[email protected]> > --- > src/amd/Android.common.mk | 3 ++- > src/amd/vulkan/Android.mk | 2 +- > src/gallium/winsys/amdgpu/drm/Android.mk | 2 +- > 3 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/src/amd/Android.common.mk b/src/amd/Android.common.mk > index 54180f16bb..1a3a00b9bc 100644 > --- 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 := \ > - $(LOCAL_PATH)/common > + $(LOCAL_PATH)/common \ > + $(intermediates)/common > > LOCAL_SHARED_LIBRARIES := \ > libdrm_amdgpu > diff --git a/src/amd/vulkan/Android.mk b/src/amd/vulkan/Android.mk > index ab39ba3b72..0725feacb5 100644 > --- 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) \ > - $(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 \ > diff --git a/src/gallium/winsys/amdgpu/drm/Android.mk > b/src/gallium/winsys/amdgpu/drm/Android.mk > index 6e84a0c8de..0b8edf972d 100644 > --- 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_STATIC_LIBRARIES := libmesa_amdgpu_addrlib > +LOCAL_STATIC_LIBRARIES := libmesa_amdgpu_addrlib libmesa_amd_common > > LOCAL_SHARED_LIBRARIES := libdrm_amdgpu > LOCAL_MODULE := libmesa_winsys_amdgpu > _______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
