diff --git a/android/bloom/jni/Android.mk b/android/bloom/jni/Android.mk
deleted file mode 100644
index db855f2f..00000000
--- a/android/bloom/jni/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../bloom
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanBloom
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../bloom/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/bloom/jni/Application.mk b/android/bloom/jni/Application.mk
deleted file mode 100644
index 62020feb..00000000
--- a/android/bloom/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/computecloth/jni/Android.mk b/android/computecloth/jni/Android.mk
deleted file mode 100644
index 5dd5217c..00000000
--- a/android/computecloth/jni/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../computecloth
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanComputecloth
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../computecloth/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/computecloth/jni/Application.mk b/android/computecloth/jni/Application.mk
deleted file mode 100644
index 62020feb..00000000
--- a/android/computecloth/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/computecullandlod/jni/Android.mk b/android/computecullandlod/jni/Android.mk
deleted file mode 100644
index 690e9119..00000000
--- a/android/computecullandlod/jni/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../computecullandlod
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanComputecullandlod
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../computecullandlod/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/computecullandlod/jni/Application.mk b/android/computecullandlod/jni/Application.mk
deleted file mode 100644
index 62020feb..00000000
--- a/android/computecullandlod/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/computeheadless/jni/Android.mk b/android/computeheadless/jni/Android.mk
deleted file mode 100644
index 0fb2ae4b..00000000
--- a/android/computeheadless/jni/Android.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../computeheadless
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanComputeheadless
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../computeheadless/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/VulkanTools.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/VulkanAndroid.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/computeheadless/jni/Application.mk b/android/computeheadless/jni/Application.mk
deleted file mode 100644
index 62020feb..00000000
--- a/android/computeheadless/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/computenbody/jni/Android.mk b/android/computenbody/jni/Android.mk
deleted file mode 100644
index fbfa9f7b..00000000
--- a/android/computenbody/jni/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../computenbody
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanComputenbody
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../computenbody/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/computenbody/jni/Application.mk b/android/computenbody/jni/Application.mk
deleted file mode 100644
index 62020feb..00000000
--- a/android/computenbody/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/computeparticles/jni/Android.mk b/android/computeparticles/jni/Android.mk
deleted file mode 100644
index 711f29df..00000000
--- a/android/computeparticles/jni/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../computeparticles
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanComputeparticles
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../computeparticles/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/computeparticles/jni/Application.mk b/android/computeparticles/jni/Application.mk
deleted file mode 100644
index 62020feb..00000000
--- a/android/computeparticles/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/computeshader/jni/Android.mk b/android/computeshader/jni/Android.mk
deleted file mode 100644
index 54832b18..00000000
--- a/android/computeshader/jni/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../computeshader
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanComputeshader
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../computeshader/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/computeshader/jni/Application.mk b/android/computeshader/jni/Application.mk
deleted file mode 100644
index 62020feb..00000000
--- a/android/computeshader/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/debugmarker/jni/Android.mk b/android/debugmarker/jni/Android.mk
deleted file mode 100644
index 8d3ef594..00000000
--- a/android/debugmarker/jni/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../debugmarker
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanDebugmarker
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../debugmarker/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/debugmarker/jni/Application.mk b/android/debugmarker/jni/Application.mk
deleted file mode 100644
index 62020feb..00000000
--- a/android/debugmarker/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/deferred/jni/Android.mk b/android/deferred/jni/Android.mk
deleted file mode 100644
index 1bdda12f..00000000
--- a/android/deferred/jni/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../deferred
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanDeferred
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../deferred/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/deferred/jni/Application.mk b/android/deferred/jni/Application.mk
deleted file mode 100644
index 62020feb..00000000
--- a/android/deferred/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/deferredmultisampling/jni/Android.mk b/android/deferredmultisampling/jni/Android.mk
deleted file mode 100644
index 02674920..00000000
--- a/android/deferredmultisampling/jni/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../deferredmultisampling
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanDeferredmulitsampling
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../deferredmultisampling/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/deferredmultisampling/jni/Application.mk b/android/deferredmultisampling/jni/Application.mk
deleted file mode 100644
index e5347482..00000000
--- a/android/deferredmultisampling/jni/Application.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-APP_CPPFLAGS += -fexceptions
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/deferredshadows/jni/Android.mk b/android/deferredshadows/jni/Android.mk
deleted file mode 100644
index 217eae8f..00000000
--- a/android/deferredshadows/jni/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../deferredshadows
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanDeferredshadows
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../deferredshadows/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/deferredshadows/jni/Application.mk b/android/deferredshadows/jni/Application.mk
deleted file mode 100644
index 62020feb..00000000
--- a/android/deferredshadows/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/displacement/jni/Android.mk b/android/displacement/jni/Android.mk
deleted file mode 100644
index 2706c5e4..00000000
--- a/android/displacement/jni/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../displacement
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanDisplacement
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../displacement/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/displacement/jni/Application.mk b/android/displacement/jni/Application.mk
deleted file mode 100644
index 62020feb..00000000
--- a/android/displacement/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/distancefieldfonts/jni/Android.mk b/android/distancefieldfonts/jni/Android.mk
deleted file mode 100644
index dc68152f..00000000
--- a/android/distancefieldfonts/jni/Android.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../distancefieldfonts
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanDistancefieldfonts
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../distancefieldfonts/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-# stringstream usage causes some warnings that would fail the build  
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/distancefieldfonts/jni/Application.mk b/android/distancefieldfonts/jni/Application.mk
deleted file mode 100644
index 62020feb..00000000
--- a/android/distancefieldfonts/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/dynamicuniformbuffer/jni/Android.mk b/android/dynamicuniformbuffer/jni/Android.mk
deleted file mode 100644
index f7bb200f..00000000
--- a/android/dynamicuniformbuffer/jni/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../dynamicuniformbuffer
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanDynamicuniformbuffer
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../dynamicuniformbuffer/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/dynamicuniformbuffer/jni/Application.mk b/android/dynamicuniformbuffer/jni/Application.mk
deleted file mode 100644
index 64b21228..00000000
--- a/android/dynamicuniformbuffer/jni/Application.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-APP_CPPFLAGS += -fexceptions
-NDK_TOOLCHAIN_VERSION := clang
\ No newline at end of file
diff --git a/android/gears/jni/Android.mk b/android/gears/jni/Android.mk
deleted file mode 100644
index 62107894..00000000
--- a/android/gears/jni/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../gears
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanGears
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../gears/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/gears/jni/Application.mk b/android/gears/jni/Application.mk
deleted file mode 100644
index 62020feb..00000000
--- a/android/gears/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/geometryshader/jni/Android.mk b/android/geometryshader/jni/Android.mk
deleted file mode 100644
index 94a7d82b..00000000
--- a/android/geometryshader/jni/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../geometryshader
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanGeometryshader
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../geometryshader/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/geometryshader/jni/Application.mk b/android/geometryshader/jni/Application.mk
deleted file mode 100644
index 62020feb..00000000
--- a/android/geometryshader/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/hdr/jni/Android.mk b/android/hdr/jni/Android.mk
deleted file mode 100644
index 95226b8e..00000000
--- a/android/hdr/jni/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../hdr
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanHDR
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../hdr/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/hdr/jni/Application.mk b/android/hdr/jni/Application.mk
deleted file mode 100644
index 62020feb..00000000
--- a/android/hdr/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/imgui/jni/Android.mk b/android/imgui/jni/Android.mk
deleted file mode 100644
index 7c2b6b9d..00000000
--- a/android/imgui/jni/Android.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../imgui
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := main
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../imgui/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-PROJECT_FILES += $(LOCAL_PATH)/../../external/imgui/imgui.cpp \
-	$(LOCAL_PATH)/../../external/imgui/imgui_demo.cpp \
-	$(LOCAL_PATH)/../../external/imgui/imgui_draw.cpp
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/imgui/
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/imgui/jni/Application.mk b/android/imgui/jni/Application.mk
deleted file mode 100644
index 62020feb..00000000
--- a/android/imgui/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/indirectdraw/jni/Android.mk b/android/indirectdraw/jni/Android.mk
deleted file mode 100644
index 1d34aa7d..00000000
--- a/android/indirectdraw/jni/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../indirectdraw
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanIndirectdraw
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../indirectdraw/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/indirectdraw/jni/Application.mk b/android/indirectdraw/jni/Application.mk
deleted file mode 100644
index 62020feb..00000000
--- a/android/indirectdraw/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/instancing/jni/Android.mk b/android/instancing/jni/Android.mk
deleted file mode 100644
index bce31727..00000000
--- a/android/instancing/jni/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../instancing
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanInstancing
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../instancing/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/instancing/jni/Application.mk b/android/instancing/jni/Application.mk
deleted file mode 100644
index 62020feb..00000000
--- a/android/instancing/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/mesh/jni/Android.mk b/android/mesh/jni/Android.mk
deleted file mode 100644
index 7cc38be1..00000000
--- a/android/mesh/jni/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../mesh
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanMesh
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../mesh/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/mesh/jni/Application.mk b/android/mesh/jni/Application.mk
deleted file mode 100644
index 62020feb..00000000
--- a/android/mesh/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/multisampling/jni/Android.mk b/android/multisampling/jni/Android.mk
deleted file mode 100644
index e80ab35e..00000000
--- a/android/multisampling/jni/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../multisampling
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanMultisampling
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../multisampling/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/multisampling/jni/Application.mk b/android/multisampling/jni/Application.mk
deleted file mode 100644
index 62020feb..00000000
--- a/android/multisampling/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/multithreading/jni/Android.mk b/android/multithreading/jni/Android.mk
deleted file mode 100644
index 8b2448ca..00000000
--- a/android/multithreading/jni/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../multithreading
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanMultithreading
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../multithreading/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/multithreading/jni/Application.mk b/android/multithreading/jni/Application.mk
deleted file mode 100644
index afb0486a..00000000
--- a/android/multithreading/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-#APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/occlusionquery/jni/Android.mk b/android/occlusionquery/jni/Android.mk
deleted file mode 100644
index 5c0c67a6..00000000
--- a/android/occlusionquery/jni/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../occlusionquery
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanOcclusionquery
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../occlusionquery/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/occlusionquery/jni/Application.mk b/android/occlusionquery/jni/Application.mk
deleted file mode 100644
index 62020feb..00000000
--- a/android/occlusionquery/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/offscreen/jni/Android.mk b/android/offscreen/jni/Android.mk
deleted file mode 100644
index 7d46b1f8..00000000
--- a/android/offscreen/jni/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../offscreen
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanOffscreen
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../offscreen/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
\ No newline at end of file
diff --git a/android/offscreen/jni/Application.mk b/android/offscreen/jni/Application.mk
deleted file mode 100644
index b6572a33..00000000
--- a/android/offscreen/jni/Application.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/parallaxmapping/jni/Android.mk b/android/parallaxmapping/jni/Android.mk
deleted file mode 100644
index f84667ca..00000000
--- a/android/parallaxmapping/jni/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../parallaxmapping
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanParallaxmapping
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../parallaxmapping/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/parallaxmapping/jni/Application.mk b/android/parallaxmapping/jni/Application.mk
deleted file mode 100644
index 62020feb..00000000
--- a/android/parallaxmapping/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/particlefire/jni/Android.mk b/android/particlefire/jni/Android.mk
deleted file mode 100644
index 659a1742..00000000
--- a/android/particlefire/jni/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../particlefire
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanParticlefire
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../particlefire/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/particlefire/jni/Application.mk b/android/particlefire/jni/Application.mk
deleted file mode 100644
index 62020feb..00000000
--- a/android/particlefire/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/pbrbasic/jni/Android.mk b/android/pbrbasic/jni/Android.mk
deleted file mode 100644
index 4b5d3dba..00000000
--- a/android/pbrbasic/jni/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../pbrbasic
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanPBRBasic
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../pbrbasic/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/pbrbasic/jni/Application.mk b/android/pbrbasic/jni/Application.mk
deleted file mode 100644
index 62020feb..00000000
--- a/android/pbrbasic/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/pbribl/jni/Android.mk b/android/pbribl/jni/Android.mk
deleted file mode 100644
index 5aecd1b7..00000000
--- a/android/pbribl/jni/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../pbribl
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanPBRIBL
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../pbribl/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/pbribl/jni/Application.mk b/android/pbribl/jni/Application.mk
deleted file mode 100644
index 62020feb..00000000
--- a/android/pbribl/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/pbrtexture/jni/Android.mk b/android/pbrtexture/jni/Android.mk
deleted file mode 100644
index 849e6f65..00000000
--- a/android/pbrtexture/jni/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../pbrtexture
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanPBRTexture
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../pbrtexture/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/pbrtexture/jni/Application.mk b/android/pbrtexture/jni/Application.mk
deleted file mode 100644
index 62020feb..00000000
--- a/android/pbrtexture/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/pipelines/jni/Android.mk b/android/pipelines/jni/Android.mk
deleted file mode 100644
index 287bed20..00000000
--- a/android/pipelines/jni/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../pipelines
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanPipelines
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../pipelines/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/pipelines/jni/Application.mk b/android/pipelines/jni/Application.mk
deleted file mode 100644
index 62020feb..00000000
--- a/android/pipelines/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/pushconstants/jni/Android.mk b/android/pushconstants/jni/Android.mk
deleted file mode 100644
index d63f0779..00000000
--- a/android/pushconstants/jni/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../pushconstants
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanPushconstants
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../pushconstants/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/pushconstants/jni/Application.mk b/android/pushconstants/jni/Application.mk
deleted file mode 100644
index 62020feb..00000000
--- a/android/pushconstants/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/radialblur/jni/Android.mk b/android/radialblur/jni/Android.mk
deleted file mode 100644
index 02fd59ad..00000000
--- a/android/radialblur/jni/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../radialblur
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanRadialblur
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../radialblur/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/radialblur/jni/Application.mk b/android/radialblur/jni/Application.mk
deleted file mode 100644
index 62020feb..00000000
--- a/android/radialblur/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/raytracing/jni/Android.mk b/android/raytracing/jni/Android.mk
deleted file mode 100644
index d0210afd..00000000
--- a/android/raytracing/jni/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../raytracing
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanRaytracing
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../raytracing/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/raytracing/jni/Application.mk b/android/raytracing/jni/Application.mk
deleted file mode 100644
index 62020feb..00000000
--- a/android/raytracing/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/renderheadless/jni/Android.mk b/android/renderheadless/jni/Android.mk
deleted file mode 100644
index c3e77d5d..00000000
--- a/android/renderheadless/jni/Android.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../renderheadless
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanRenderheadless
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../renderheadless/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/VulkanTools.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/VulkanAndroid.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
\ No newline at end of file
diff --git a/android/renderheadless/jni/Application.mk b/android/renderheadless/jni/Application.mk
deleted file mode 100644
index 62020feb..00000000
--- a/android/renderheadless/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/scenerendering/jni/Android.mk b/android/scenerendering/jni/Android.mk
deleted file mode 100644
index 4b245327..00000000
--- a/android/scenerendering/jni/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../scenerendering
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanScenerendering
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../scenerendering/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/scenerendering/jni/Application.mk b/android/scenerendering/jni/Application.mk
deleted file mode 100644
index 62020feb..00000000
--- a/android/scenerendering/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/shadowmapping/jni/Android.mk b/android/shadowmapping/jni/Android.mk
deleted file mode 100644
index fff4674b..00000000
--- a/android/shadowmapping/jni/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../shadowmapping
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanShadowmapping
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../shadowmapping/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/shadowmapping/jni/Application.mk b/android/shadowmapping/jni/Application.mk
deleted file mode 100644
index 62020feb..00000000
--- a/android/shadowmapping/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/shadowmappingomni/jni/Android.mk b/android/shadowmappingomni/jni/Android.mk
deleted file mode 100644
index 9ab54801..00000000
--- a/android/shadowmappingomni/jni/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../shadowmappingomni
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanShadowmappingomni
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../shadowmappingomni/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/shadowmappingomni/jni/Application.mk b/android/shadowmappingomni/jni/Application.mk
deleted file mode 100644
index 62020feb..00000000
--- a/android/shadowmappingomni/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/skeletalanimation/jni/Android.mk b/android/skeletalanimation/jni/Android.mk
deleted file mode 100644
index d2680787..00000000
--- a/android/skeletalanimation/jni/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../skeletalanimation
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanSkeletalanimation
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../skeletalanimation/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/skeletalanimation/jni/Application.mk b/android/skeletalanimation/jni/Application.mk
deleted file mode 100644
index 62020feb..00000000
--- a/android/skeletalanimation/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/specializationconstants/jni/Android.mk b/android/specializationconstants/jni/Android.mk
deleted file mode 100644
index 17c5755b..00000000
--- a/android/specializationconstants/jni/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../specializationconstants
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanSpecializationconstants
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../specializationconstants/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/specializationconstants/jni/Application.mk b/android/specializationconstants/jni/Application.mk
deleted file mode 100644
index e5347482..00000000
--- a/android/specializationconstants/jni/Application.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-APP_CPPFLAGS += -fexceptions
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/sphericalenvmapping/jni/Android.mk b/android/sphericalenvmapping/jni/Android.mk
deleted file mode 100644
index 96a93b2b..00000000
--- a/android/sphericalenvmapping/jni/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../sphericalenvmapping
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanSphericalenvmapping
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../sphericalenvmapping/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/sphericalenvmapping/jni/Application.mk b/android/sphericalenvmapping/jni/Application.mk
deleted file mode 100644
index 62020feb..00000000
--- a/android/sphericalenvmapping/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/ssao/jni/Android.mk b/android/ssao/jni/Android.mk
deleted file mode 100644
index f37523f5..00000000
--- a/android/ssao/jni/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../ssao
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanSSAO
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../ssao/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/ssao/jni/Application.mk b/android/ssao/jni/Application.mk
deleted file mode 100644
index 62020feb..00000000
--- a/android/ssao/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/stencilbuffer/jni/Android.mk b/android/stencilbuffer/jni/Android.mk
deleted file mode 100644
index 9489ce88..00000000
--- a/android/stencilbuffer/jni/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../stencilbuffer
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanStencilbuffer
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../stencilbuffer/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/stencilbuffer/jni/Application.mk b/android/stencilbuffer/jni/Application.mk
deleted file mode 100644
index 62020feb..00000000
--- a/android/stencilbuffer/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/subpasses/jni/Android.mk b/android/subpasses/jni/Android.mk
deleted file mode 100644
index 2c3b57a3..00000000
--- a/android/subpasses/jni/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../subpasses
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanSubpasses
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../subpasses/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/subpasses/jni/Application.mk b/android/subpasses/jni/Application.mk
deleted file mode 100644
index 62020feb..00000000
--- a/android/subpasses/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/terraintessellation/jni/Android.mk b/android/terraintessellation/jni/Android.mk
deleted file mode 100644
index ddb1374f..00000000
--- a/android/terraintessellation/jni/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../terraintessellation
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanTerraintessellation
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../terraintessellation/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/terraintessellation/jni/Application.mk b/android/terraintessellation/jni/Application.mk
deleted file mode 100644
index 62020feb..00000000
--- a/android/terraintessellation/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/tessellation/jni/Android.mk b/android/tessellation/jni/Android.mk
deleted file mode 100644
index 52f2c3fc..00000000
--- a/android/tessellation/jni/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../tessellation
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanTessellation
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../tessellation/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/tessellation/jni/Application.mk b/android/tessellation/jni/Application.mk
deleted file mode 100644
index 62020feb..00000000
--- a/android/tessellation/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/textoverlay/jni/Android.mk b/android/textoverlay/jni/Android.mk
deleted file mode 100644
index a8e0b2dc..00000000
--- a/android/textoverlay/jni/Android.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../textoverlay
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanTextoverlay
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../textoverlay/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS = true
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/textoverlay/jni/Application.mk b/android/textoverlay/jni/Application.mk
deleted file mode 100644
index 62020feb..00000000
--- a/android/textoverlay/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/texture/jni/Android.mk b/android/texture/jni/Android.mk
deleted file mode 100644
index b501491a..00000000
--- a/android/texture/jni/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../texture
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanTexture
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../texture/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/texture/jni/Application.mk b/android/texture/jni/Application.mk
deleted file mode 100644
index 62020feb..00000000
--- a/android/texture/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/texture3d/jni/Android.mk b/android/texture3d/jni/Android.mk
deleted file mode 100644
index 50e473b6..00000000
--- a/android/texture3d/jni/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../texture3d
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanTexture3d
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../texture3d/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/texture3d/jni/Application.mk b/android/texture3d/jni/Application.mk
deleted file mode 100644
index 62020feb..00000000
--- a/android/texture3d/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/texturearray/jni/Android.mk b/android/texturearray/jni/Android.mk
deleted file mode 100644
index b71fc78c..00000000
--- a/android/texturearray/jni/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../texturearray
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanTexturearray
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../texturearray/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/texturearray/jni/Application.mk b/android/texturearray/jni/Application.mk
deleted file mode 100644
index 62020feb..00000000
--- a/android/texturearray/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/texturecubemap/jni/Android.mk b/android/texturecubemap/jni/Android.mk
deleted file mode 100644
index 17313799..00000000
--- a/android/texturecubemap/jni/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../texturecubemap
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanTexturecubemap
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../texturecubemap/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/texturecubemap/jni/Application.mk b/android/texturecubemap/jni/Application.mk
deleted file mode 100644
index 62020feb..00000000
--- a/android/texturecubemap/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/texturemipmapgen/jni/Android.mk b/android/texturemipmapgen/jni/Android.mk
deleted file mode 100644
index 674ddd6a..00000000
--- a/android/texturemipmapgen/jni/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../texturemipmapgen
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanTexturemipmapgen
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../texturemipmapgen/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/texturemipmapgen/jni/Application.mk b/android/texturemipmapgen/jni/Application.mk
deleted file mode 100644
index 62020feb..00000000
--- a/android/texturemipmapgen/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/triangle/jni/Android.mk b/android/triangle/jni/Android.mk
deleted file mode 100644
index c86931af..00000000
--- a/android/triangle/jni/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../triangle
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanTriangle
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../triangle/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/triangle/jni/Application.mk b/android/triangle/jni/Application.mk
deleted file mode 100644
index e5347482..00000000
--- a/android/triangle/jni/Application.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-APP_CPPFLAGS += -fexceptions
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/vulkanscene/jni/Android.mk b/android/vulkanscene/jni/Android.mk
deleted file mode 100644
index 59667eca..00000000
--- a/android/vulkanscene/jni/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../vulkanscene
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanVulkanscene
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../vulkanscene/*.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog -lz
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-LOCAL_STATIC_LIBRARIES += libassimp
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)
diff --git a/android/vulkanscene/jni/Application.mk b/android/vulkanscene/jni/Application.mk
deleted file mode 100644
index 62020feb..00000000
--- a/android/vulkanscene/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang