diff --git a/base/vulkanexamplebase.cpp b/base/vulkanexamplebase.cpp
index 6a901058..41fac974 100644
--- a/base/vulkanexamplebase.cpp
+++ b/base/vulkanexamplebase.cpp
@@ -218,7 +218,11 @@ VkPipelineShaderStageCreateInfo VulkanExampleBase::loadShader(const char * fileN
 	VkPipelineShaderStageCreateInfo shaderStage = {};
 	shaderStage.sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO;
 	shaderStage.stage = stage;
+#if defined(__ANDROID__)
+	shaderStage.module = vkTools::loadShader(androidApp->activity->assetManager, fileName, device, stage);
+#else
 	shaderStage.module = vkTools::loadShader(fileName, device, stage);
+#endif
 	shaderStage.pName = "main"; // todo : make param
 	assert(shaderStage.module != NULL);
 	shaderModules.push_back(shaderStage.module);
@@ -1176,7 +1180,7 @@ void VulkanExampleBase::initSwapchain()
 #if defined(_WIN32)
 	swapChain.initSurface(windowInstance, window);
 #elif defined(__ANDROID__)	
-	swapChain.initSurface(window);
+	swapChain.initSurface(androidApp->window);
 #elif defined(__linux__)
 	swapChain.initSurface(connection, window);
 #endif
diff --git a/base/vulkanexamplebase.h b/base/vulkanexamplebase.h
index de1807d3..6c9dc88e 100644
--- a/base/vulkanexamplebase.h
+++ b/base/vulkanexamplebase.h
@@ -15,6 +15,8 @@
 #include <io.h>
 #elif defined(__ANDROID__)
 #include <android/native_activity.h>
+#include <android/asset_manager.h>
+#include <android_native_app_glue.h>
 #include "vulkanandroid.h"
 #elif defined(__linux__)
 #include <xcb/xcb.h>
@@ -154,7 +156,7 @@ public:
 	HWND window;
 	HINSTANCE windowInstance;
 #elif defined(__ANDROID__)
-	ANativeWindow* window;
+	android_app* androidApp;
 #elif defined(__linux__)
 	struct {
 		bool left = false;