vulkaninfo: Android executable build
diff --git a/demos/android/jni/Android.mk b/demos/android/jni/Android.mk
index 839dacc..9a31c7a 100644
--- a/demos/android/jni/Android.mk
+++ b/demos/android/jni/Android.mk
@@ -32,4 +32,17 @@
LOCAL_LDFLAGS := -u ANativeActivity_onCreate
include $(BUILD_SHARED_LIBRARY)
+include $(CLEAR_VARS)
+LOCAL_MODULE := vulkaninfo
+LOCAL_SRC_FILES += $(DEMO_DIR)/vulkaninfo.c \
+ $(SRC_DIR)/common/vulkan_wrapper.cpp
+LOCAL_C_INCLUDES += $(SRC_DIR)/include \
+ $(DEMO_DIR)/android/include \
+ $(SRC_DIR)/libs \
+ $(SRC_DIR)/common
+LOCAL_CFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR --include=$(SRC_DIR)/common/vulkan_wrapper.h
+LOCAL_LDLIBS := -llog
+LOCAL_LDFLAGS := -Wl,--exclude-libs,ALL
+include $(BUILD_EXECUTABLE)
+
$(call import-module,android/native_app_glue)
diff --git a/demos/android/jni/Application.mk b/demos/android/jni/Application.mk
index e215f21..1931d72 100644
--- a/demos/android/jni/Application.mk
+++ b/demos/android/jni/Application.mk
@@ -16,7 +16,7 @@
APP_ABI := armeabi-v7a arm64-v8a x86 x86_64
APP_PLATFORM := android-23
APP_STL := gnustl_static
-APP_MODULES := Cube
+APP_MODULES := Cube vulkaninfo
APP_CPPFLAGS += -std=c++11 -fexceptions -Wall -Werror -Wextra -Wno-unused-parameter -DVK_NO_PROTOTYES -DGLM_FORCE_RADIANS
APP_CFLAGS += -Wall -Werror -Wextra -Wno-unused-parameter -DVK_NO_PROTOTYES -DGLM_FORCE_RADIANS
NDK_TOOLCHAIN_VERSION := clang
