diff --git a/renderdoccmd/CMakeLists.txt b/renderdoccmd/CMakeLists.txt
index c8f63331c..510bbffb0 100644
--- a/renderdoccmd/CMakeLists.txt
+++ b/renderdoccmd/CMakeLists.txt
@@ -49,3 +49,21 @@ add_custom_command(TARGET renderdoccmd POST_BUILD
 	COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_SOURCE_DIR}/bin/)
 add_custom_command(TARGET renderdoccmd POST_BUILD
 	COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:renderdoccmd> ${CMAKE_SOURCE_DIR}/bin/)
+
+if(BUILD_ANDROID)
+    set(APK_TARGET_ID "1" CACHE STRING "The Target ID to build the APK for, use <android list targets> to choose another one.")
+
+    set(APK_FILE ${CMAKE_BINARY_DIR}/RenderDocCmd.apk)
+    add_custom_target(apk ALL
+                      DEPENDS ${APK_FILE}
+                      DEPENDS renderdoc
+                      DEPENDS renderdoccmd)
+    add_custom_command(OUTPUT ${APK_FILE}
+                       WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/renderdoccmd/android
+                       COMMAND ${CMAKE_COMMAND} -E make_directory libs/${ANDROID_ABI}
+                       COMMAND ${CMAKE_COMMAND} -E create_symlink $<TARGET_FILE:renderdoc> libs/${ANDROID_ABI}/$<TARGET_FILE_NAME:renderdoc>
+                       COMMAND ${CMAKE_COMMAND} -E create_symlink $<TARGET_FILE:renderdoccmd> libs/${ANDROID_ABI}/$<TARGET_FILE_NAME:renderdoccmd>
+                       COMMAND android update project --path . --name RenderDocCmd --target ${APK_TARGET_ID}
+                       COMMAND ant debug
+                       COMMAND ${CMAKE_COMMAND} -E copy bin/RenderDocCmd-debug.apk ${APK_FILE})
+endif()