Mesa (master): android: vulkan/util: add dependency on libnativewindow for O and later

[Tapani Pälli]

Module: Mesa
Branch: master
Commit: 6451b0703ff3027b746d6268b98dd2b3e6698be5
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6451b0703ff3027b746d6268b98dd2b3e6698be5

Author: Mauro Rossi <issor.oruam at gmail.com>
Date:   Sun Feb  4 22:57:11 2018 +0100

android: vulkan/util: add dependency on libnativewindow for O and later

Similar to 90dd6e5 ("Android: egl: add dependency on libnativewindow")

Fixes the following building error:

In file included from out/target/product/x86_64/obj_x86/STATIC_LIBRARIES/libmesa_vulkan_util_intermediates/util/vk_enum_to_str.c:26:
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-stable at lists.freedesktop.org>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>

---

 src/vulkan/Android.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/vulkan/Android.mk b/src/vulkan/Android.mk
index 6d6df938ab..70b23eae08 100644
--- a/src/vulkan/Android.mk
+++ b/src/vulkan/Android.mk
@@ -59,5 +59,9 @@ $(LOCAL_GENERATED_SOURCES): $(MESA_TOP)/src/vulkan/util/gen_enum_to_str.py \
 LOCAL_EXPORT_C_INCLUDE_DIRS := \
         $(intermediates)
 
+ifeq ($(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5 6 7),)
+LOCAL_SHARED_LIBRARIES += libnativewindow
+endif
+
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)