On 5 February 2018 at 08:09, Tapani Pälli <tapani.pa...@intel.com> wrote: > Hi; > > > On 02/04/2018 11:57 PM, Mauro Rossi wrote: >> >> Similar to 90dd6e5 ("Android: egl: add dependency on libnativewindow") >> >> Fixes the following building errors: >> >> In file included from external/mesa/src/intel/vulkan/gen7_cmd_buffer.c:30: >> In file included from external/mesa/src/intel/vulkan/anv_private.h:72: >> external/mesa/include/vulkan/vk_android_native_buffer.h:22:10: fatal >> error: 'system/window.h' file not found >> ^~~~~~~~~~~~~~~~~ >> 1 error generated. >> ... >> In file included from external/mesa/src/intel/vulkan/anv_gem.c:32: >> In file included from external/mesa/src/intel/vulkan/anv_private.h:72: >> external/mesa/include/vulkan/vk_android_native_buffer.h:22:10: fatal >> error: 'system/window.h' file not found >> ^~~~~~~~~~~~~~~~~ >> 1 error generated. >> >> Cc: "18.0" <mesa-sta...@lists.freedesktop.org> >> --- >> src/intel/Android.vulkan.mk | 28 ++++++++++++++++++++++++++++ >> 1 file changed, 28 insertions(+) >> >> diff --git a/src/intel/Android.vulkan.mk b/src/intel/Android.vulkan.mk >> index 5c8c947136..3a6870097b 100644 >> --- a/src/intel/Android.vulkan.mk >> +++ b/src/intel/Android.vulkan.mk >> @@ -102,6 +102,10 @@ LOCAL_WHOLE_STATIC_LIBRARIES := >> libmesa_anv_entrypoints libmesa_genxml >> LOCAL_SHARED_LIBRARIES := libdrm >> +ifeq ($(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5 6 7),) >> +LOCAL_SHARED_LIBRARIES += libnativewindow >> +endif >> + > > > How about introducing ANV_LIBRARIES (near to ANV_INCLUDES) and setting > libdrm and libnativewindow there, then for each libanv just have the > $(ANV_LIBRARIES)? > > IMO this would make it cleaner to add new libs like we do here. In > Android-IA we've just had the libnativewindow include path (since that is > enough) but this is more cleaner way. > IIRC some (most?) versions of the Android build system do not understand header-only dependencies. Thus by using the shared/static library, we effectively ask to overlink the final binary,
That aside (since we cannot do much about it), with Tapani's suggestions the series is Reviewed-by: Emil Velikov <emil.l.veli...@gmail.com> Mauro you have been providing good patches for a while. You can get commit access to push them to the master branch. Please check the instructions [1] and an example [2]. As a Tl;Dr; - create gpg and ssh keys - open a bug report + attach the public bits of ^^ [please add me to the CC list] Thanks Emil [1] https://www.freedesktop.org/wiki/AccountRequests/ [2] https://bugs.freedesktop.org/show_bug.cgi?id=103683 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev