commit 621b3410f5f88e2a3743bc025b100717cac26e63
author Alex Smith <asmith@feralinteractive.com> Tue Jun 06 12:31:05 2017 +0100
committer Jason Ekstrand <jason.ekstrand@intel.com> Tue Jun 06 08:17:13 2017 -0700
tree 1b3714721de48490a4a25f361e93c400f0e03f7b
parent 2ef73473c8eedab679637334a0af597d26222e0a

util/vulkan: Move Vulkan utilities to src/vulkan/util

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>

Android.common.mk

diff --git a/Android.common.mk b/Android.common.mk
index 44ad97b..6bd3081 100644
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -37,6 +37,7 @@
 	-Wno-missing-field-initializers \
 	-Wno-initializer-overrides \
 	-Wno-mismatched-tags \
+	-DVERSION=\"$(MESA_VERSION)\" \
 	-DPACKAGE_VERSION=\"$(MESA_VERSION)\" \
 	-DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\"