From d38ad5e2c9e12e68333645affa7a6b0764979d6e Mon Sep 17 00:00:00 2001
From: Michael Rennie <m.rennie@partner.samsung.com>
Date: Thu, 13 Oct 2016 12:03:58 +0100
Subject: [PATCH] Make APK file itself depend on renderdoc & renderdoccmd.

Previously the custom command wasn't running when .so's changed.
---
 renderdoccmd/CMakeLists.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/renderdoccmd/CMakeLists.txt b/renderdoccmd/CMakeLists.txt
index c872fada0..4d1822b64 100644
--- a/renderdoccmd/CMakeLists.txt
+++ b/renderdoccmd/CMakeLists.txt
@@ -50,15 +50,15 @@ add_custom_command(TARGET renderdoccmd POST_BUILD
 add_custom_command(TARGET renderdoccmd POST_BUILD
 	COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:renderdoccmd> ${CMAKE_SOURCE_DIR}/bin/)
 
-if(BUILD_ANDROID)
+if(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)
+                      DEPENDS ${APK_FILE})
     add_custom_command(OUTPUT ${APK_FILE}
+                       DEPENDS renderdoc
+                       DEPENDS renderdoccmd
                        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/renderdoccmd/android
                        COMMAND ${CMAKE_COMMAND} -E make_directory libs/${ANDROID_ABI}
                        COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:renderdoc> libs/${ANDROID_ABI}/$<TARGET_FILE_NAME:renderdoc>