From 6ce6c20b154a89b9e50646d6bb70b7da763abc87 Mon Sep 17 00:00:00 2001 From: Michael Lentine Date: Thu, 3 Dec 2015 14:33:09 -0800 Subject: android: Fix android build. Temporarily disable shader checker which now depends on glslang Fix xcb guards and set the ifdef based on platform --- buildAndroid/jni/Application.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'buildAndroid') diff --git a/buildAndroid/jni/Application.mk b/buildAndroid/jni/Application.mk index 1962e681..d89707fe 100644 --- a/buildAndroid/jni/Application.mk +++ b/buildAndroid/jni/Application.mk @@ -15,6 +15,6 @@ APP_ABI := armeabi-v7a arm64-v8a x86 x86_64 mips mips64 APP_PLATFORM := android-22 APP_STL := gnustl_static -APP_MODULES := layer_utils VKLayerBasic VKLayerDrawState VKLayerMemTracker VKLayerShaderCheker VKLayerImage VKLayerParamChecker VKLayerGeneric VKLayerAPIDump VKLayerObjectTracker VKLayerThreading VKLayerValidationTests +APP_MODULES := layer_utils VKLayerBasic VKLayerDrawState VKLayerMemTracker VKLayerImage VKLayerParamChecker VKLayerGeneric VKLayerAPIDump VKLayerObjectTracker VKLayerThreading VKLayerValidationTests APP_CPPFLAGS += -std=c++11 -DVK_PROTOTYPES NDK_TOOLCHAIN_VERSION := 4.8 -- cgit v1.2.3