Mesa (master): android: fix vulkan driver build

[Tapani Pälli]

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

Author: Tapani Pälli <tapani.palli at intel.com>
Date:   Tue Dec 12 10:01:57 2017 +0200

android: fix vulkan driver build

fixes undefined references by adding missing wsi common API

Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>

---

 src/vulkan/Android.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/vulkan/Android.mk b/src/vulkan/Android.mk
index 47c5c51081..6d6df938ab 100644
--- a/src/vulkan/Android.mk
+++ b/src/vulkan/Android.mk
@@ -36,12 +36,13 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 intermediates := $(call local-generated-sources-dir)
 
 LOCAL_C_INCLUDES := \
-	$(MESA_TOP)/include/vulkan
+	$(MESA_TOP)/include/vulkan \
+	$(MESA_TOP)/src/vulkan/util
 
 LOCAL_GENERATED_SOURCES := $(addprefix $(intermediates)/, \
 	$(VULKAN_UTIL_GENERATED_FILES))
 
-LOCAL_SRC_FILES := $(VULKAN_UTIL_FILES)
+LOCAL_SRC_FILES := $(VULKAN_UTIL_FILES) $(VULKAN_WSI_FILES)
 
 vulkan_api_xml = $(MESA_TOP)/src/vulkan/registry/vk.xml
 vk_android_native_buffer_xml = $(MESA_TOP)/src/vulkan/registry/vk_android_native_buffer.xml