From 0c1babe6f9521228f9ba087bce4939a944324697 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 28 Jan 2015 10:25:11 -0800
Subject: [PATCH] allow APK rename, fix hockey app update

---
 cmake/android/AndroidManifest.xml.in |  4 ++--
 cmake/android/QtCreateAPK.cmake      | 10 +++++++++-
 gvr-interface/CMakeLists.txt         |  1 +
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/cmake/android/AndroidManifest.xml.in b/cmake/android/AndroidManifest.xml.in
index f22fc091a8..f6ce914148 100755
--- a/cmake/android/AndroidManifest.xml.in
+++ b/cmake/android/AndroidManifest.xml.in
@@ -51,6 +51,8 @@
               android:configChanges="screenSize|orientation|keyboardHidden|keyboard">
     </activity>
     
+    ${HOCKEY_APP_ACTIVITY}
+    
   </application>
   <uses-sdk android:minSdkVersion="${ANDROID_API_LEVEL}" android:targetSdkVersion="${ANDROID_API_LEVEL}"/>
 
@@ -68,6 +70,4 @@
   
   <!-- Tell the system this app requires OpenGL ES 3.0. -->
   <uses-feature android:glEsVersion="0x00030000" android:required="true" />
-  
-  ${HOCKEY_APP_ACTIVITY}
 </manifest>
\ No newline at end of file
diff --git a/cmake/android/QtCreateAPK.cmake b/cmake/android/QtCreateAPK.cmake
index 0591acb0ae..9b5bdfd4c4 100644
--- a/cmake/android/QtCreateAPK.cmake
+++ b/cmake/android/QtCreateAPK.cmake
@@ -123,5 +123,13 @@ macro(qt_create_apk)
   add_custom_target(${TARGET_NAME}-apk
     COMMAND ${ANDROID_DEPLOY_QT} --input "${TARGET_NAME}-deployment.json" --output "${ANDROID_APK_OUTPUT_DIR}" --android-platform android-${ANDROID_API_LEVEL} ${ANDROID_DEPLOY_QT_INSTALL} --verbose --deployment bundled "\\$(ARGS)"
     DEPENDS ${TARGET_NAME} ${TARGET_NAME}-copy-res ${TARGET_NAME}-copy-assets ${TARGET_NAME}-copy-java ${TARGET_NAME}-copy-libs
-  ) 
+  )
+  
+  if (ANDROID_APK_CUSTOM_NAME) 
+    add_custom_command(
+      TARGET ${TARGET_NAME}-apk
+      POST_BUILD
+      COMMAND ${CMAKE_COMMAND} -E rename "${ANDROID_APK_OUTPUT_DIR}/bin/QtApp-debug.apk" "${ANDROID_APK_OUTPUT_DIR}/bin/${ANDROID_APK_CUSTOM_NAME}"
+    )
+  endif ()
 endmacro()
\ No newline at end of file
diff --git a/gvr-interface/CMakeLists.txt b/gvr-interface/CMakeLists.txt
index c62584916a..9a9c3c3987 100644
--- a/gvr-interface/CMakeLists.txt
+++ b/gvr-interface/CMakeLists.txt
@@ -40,6 +40,7 @@ if (HOCKEY_APP_ID)
   set(HOCKEY_APP_ACTIVITY "<activity android:name='net.hockeyapp.android.UpdateActivity' />")
   set(ANDROID_ACTIVITY_NAME io.highfidelity.gvrinterface.InterfaceBetaActivity)
   set(ANDROID_DEPLOY_QT_INSTALL "")
+  set(ANDROID_APK_CUSTOM_NAME "Interface-beta.apk")
   
   # set the ANDROID_APK_VERSION_CODE to the number of git commits
   execute_process(