[Mesa-dev] [PATCH] android: radv: fix necessary dependecies

[Mauro Rossi]

Hi,
please provide Reviewed-by when possible

There is another patch sent to ML which his already reviewed by Tapani and
waiting for this one

Mauro

On Wed, Apr 24, 2019 at 3:44 PM Mauro Rossi <issor.oruam at gmail.com> wrote:

> Fixes building errors due to missing libmesa_util generated files include
> and libexpat dependencies:
>
> In file included from external/mesa/src/amd/vulkan/radv_device.c:52:
> external/mesa/src/util/xmlpool.h:115:10: fatal error: 'xmlpool/options.h'
> file not found
>          ^~~~~~~~~~~~~~~~~~~
> 1 error generated.
>
> FAILED:
> out/target/product/x86_64/obj_x86/SHARED_LIBRARIES/vulkan.radv_intermediates/LINKED/
> vulkan.radv.so
> ...
> external/mesa/src/util/xmlconfig.c:670: error: undefined reference to
> 'XML_ParserCreate'
> ...
> clang.real: error: linker command failed with exit code 1 (use -v to see
> invocation)
>
> Fixes: 3c2e826 ("radv: Add support for driconf.")
> Signed-off-by: Mauro Rossi <issor.oruam at gmail.com>
> ---
>  src/amd/vulkan/Android.mk | 12 +++++++++++-
>  1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/src/amd/vulkan/Android.mk b/src/amd/vulkan/Android.mk
> index 9574bf54e5..ab39ba3b72 100644
> --- a/src/amd/vulkan/Android.mk
> +++ b/src/amd/vulkan/Android.mk
> @@ -71,7 +71,8 @@ LOCAL_C_INCLUDES := \
>         $(call
> generated-sources-dir-for,STATIC_LIBRARIES,libmesa_amd_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_vulkan_util,,)/util \
> +       $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_util,,)
>
>  LOCAL_WHOLE_STATIC_LIBRARIES := \
>         libmesa_vulkan_util \
> @@ -165,5 +166,14 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
>
>  LOCAL_SHARED_LIBRARIES += $(RADV_SHARED_LIBRARIES) libz libsync liblog
>
> +# If Android version >=8 MESA should static link libexpat else should
> dynamic link
> +ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 27; echo $$?), 0)
> +LOCAL_STATIC_LIBRARIES := \
> +       libexpat
> +else
> +LOCAL_SHARED_LIBRARIES += \
> +       libexpat
> +endif
> +
>  include $(MESA_COMMON_MK)
>  include $(BUILD_SHARED_LIBRARY)
> --
> 2.20.1
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20190608/7bd84935/attachment.html>