From: Mauro Rossi Date: Wed, 24 Apr 2019 13:11:02 +0000 (+0200) Subject: android: radv: fix necessary dependecies X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=51e24af8fdebeac58891378278af4351789a9e88;p=mesa.git android: radv: fix necessary dependecies Fixes building errors due to libmesa_util 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 Reviewed-by: Tapani Pälli --- diff --git a/src/amd/vulkan/Android.mk b/src/amd/vulkan/Android.mk index 9574bf54e5a..ab39ba3b723 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)