From 621b3410f5f88e2a3743bc025b100717cac26e63 Mon Sep 17 00:00:00 2001
From: Alex Smith <asmith@feralinteractive.com>
Date: Tue, 6 Jun 2017 12:31:05 +0100
Subject: util/vulkan: Move Vulkan utilities to src/vulkan/util
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We have Vulkan utilities in both src/util and src/vulkan/util. The
latter seems a more appropriate place for Vulkan-specific things, so
move them there.

v2: Android build system changes (from Tapani Pälli)

Signed-off-by: Alex Smith <asmith@feralinteractive.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
Acked-by: Jason Ekstrand <jason@jlekstrand.net>
---
 src/vulkan/Android.mk | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/vulkan/Android.mk')

diff --git a/src/vulkan/Android.mk b/src/vulkan/Android.mk
index 7653f34c68a..8eb42ece878 100644
--- a/src/vulkan/Android.mk
+++ b/src/vulkan/Android.mk
@@ -41,6 +41,8 @@ LOCAL_C_INCLUDES := \
 LOCAL_GENERATED_SOURCES := $(addprefix $(intermediates)/, \
 	$(VULKAN_UTIL_GENERATED_FILES))
 
+LOCAL_SRC_FILES := $(VULKAN_UTIL_FILES))
+
 vulkan_api_xml = $(MESA_TOP)/src/vulkan/registry/vk.xml
 
 $(LOCAL_GENERATED_SOURCES): $(MESA_TOP)/src/vulkan/util/gen_enum_to_str.py $(vulkan_api_xml)
-- 
cgit v1.2.3