diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt
index b65241a71..0a9a0d6dc 100644
--- a/renderdoc/CMakeLists.txt
+++ b/renderdoc/CMakeLists.txt
@@ -18,6 +18,7 @@ if(ANDROID)
         PRIVATE m
         PRIVATE dl
         PRIVATE log
+        PRIVATE android
         PRIVATE ${CMAKE_THREAD_LIBS_INIT})
 elseif(APPLE)
     list(APPEND RDOC_LIBRARIES
diff --git a/renderdoc/driver/vulkan/vk_android.cpp b/renderdoc/driver/vulkan/vk_android.cpp
index 30aabfe22..bce169cf5 100644
--- a/renderdoc/driver/vulkan/vk_android.cpp
+++ b/renderdoc/driver/vulkan/vk_android.cpp
@@ -47,9 +47,13 @@ void VulkanReplay::OutputWindow::CreateSurface(VkInstance inst)
 
 void VulkanReplay::GetOutputWindowDimensions(uint64_t id, int32_t &w, int32_t &h)
 {
-  w = 500;
-  h = 500;    // FIXME
-  RDCLOG("VulkanReplay::GetOutputWindowDimensions: %i, %i", w, h);
+  if(id == 0 || m_OutputWindows.find(id) == m_OutputWindows.end())
+    return;
+
+  OutputWindow &outw = m_OutputWindows[id];
+
+  w = ANativeWindow_getWidth(outw.wnd);
+  h = ANativeWindow_getHeight(outw.wnd);
 }
 
 const char *VulkanLibraryName = "libvulkan.so";