diff options
| author | Michael Lentine <mlentine@google.com> | 2015-12-03 14:33:09 -0800 |
|---|---|---|
| committer | Mark Lobodzinski <mark@lunarg.com> | 2015-12-11 15:32:58 -0700 |
| commit | 6ce6c20b154a89b9e50646d6bb70b7da763abc87 (patch) | |
| tree | 5b471e3d6c0cadf633fdd0b777b899c6d82e166b /buildAndroid | |
| parent | c862cd354e1eaea10c41024f3a2fc4eef58ddacd (diff) | |
| download | usermoji-6ce6c20b154a89b9e50646d6bb70b7da763abc87.tar.xz | |
android: Fix android build.
Temporarily disable shader checker which now depends on glslang
Fix xcb guards and set the ifdef based on platform
Diffstat (limited to 'buildAndroid')
| -rw-r--r-- | buildAndroid/jni/Application.mk | 2 |
1 files changed, 1 insertions, 1 deletions
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
|