Mesa (staging/18.1): radv: Fix missing Android platform define.

[GitLab Mirror]

Module: Mesa
Branch: staging/18.1
Commit: ee595b275c45b7910b851c7f9f9617f4608c8a8c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ee595b275c45b7910b851c7f9f9617f4608c8a8c

Author: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Date:   Fri Aug 10 02:26:19 2018 +0200

radv: Fix missing Android platform define.

CC: <mesa-stable at lists.freedesktop.org>
Acked-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
(cherry picked from commit bf33ca751252e9735418e33bacd257a8b431b102)
Conflicts resolved by Dylan

Conflicts:
	src/amd/vulkan/Android.mk

There is no android.mk support in 18.1 for radv, so only apply the parts
for autotools android builds, which can be used by android
implementations not using android.mk files

---

 src/amd/vulkan/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/amd/vulkan/Makefile.am b/src/amd/vulkan/Makefile.am
index 18f263ab44..91b994d3c9 100644
--- a/src/amd/vulkan/Makefile.am
+++ b/src/amd/vulkan/Makefile.am
@@ -104,7 +104,7 @@ VULKAN_LIB_DEPS += \
 endif
 
 if HAVE_PLATFORM_ANDROID
-AM_CPPFLAGS += $(ANDROID_CPPFLAGS)
+AM_CPPFLAGS += $(ANDROID_CPPFLAGS) -DVK_USE_PLATFORM_ANDROID_KHR
 AM_CFLAGS += $(ANDROID_CFLAGS)
 VULKAN_LIB_DEPS += $(ANDROID_LIBS)
 VULKAN_SOURCES += $(VULKAN_ANDROID_FILES)