From 37f762a08f7cce6e03f2492374d399444fd3dfc1 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Tue, 7 Jan 2020 13:59:25 +0000
Subject: [PATCH] Use renderdoc-specific name for keystore alias on android

---
 renderdoc/android/android_patch.cpp             | 4 ++--
 renderdoccmd/CMakeLists.txt                     | 4 ++--
 util/buildscripts/scripts/make_package_win32.sh | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/renderdoc/android/android_patch.cpp b/renderdoc/android/android_patch.cpp
index 0422da160..dd3b0a8df 100644
--- a/renderdoc/android/android_patch.cpp
+++ b/renderdoc/android/android_patch.cpp
@@ -211,7 +211,7 @@ rdcstr GetAndroidDebugKey()
   create += " -genkey";
   create += " -keystore \"" + key + "\"";
   create += " -storepass android";
-  create += " -alias androiddebugkey";
+  create += " -alias rdocandroidkey";
   create += " -keypass android";
   create += " -keyalg RSA";
   create += " -keysize 2048";
@@ -242,7 +242,7 @@ bool DebugSignAPK(const rdcstr &apk, const rdcstr &workDir)
   args += " --ks \"" + debugKey + "\" ";
   args += " --ks-pass pass:android ";
   args += " --key-pass pass:android ";
-  args += " --ks-key-alias androiddebugkey ";
+  args += " --ks-key-alias rdocandroidkey ";
   args += "\"" + apk + "\"";
 
   if(!apksigner.contains(".jar"))
diff --git a/renderdoccmd/CMakeLists.txt b/renderdoccmd/CMakeLists.txt
index 7e4747284..4149b148b 100644
--- a/renderdoccmd/CMakeLists.txt
+++ b/renderdoccmd/CMakeLists.txt
@@ -143,7 +143,7 @@ if(ANDROID)
     set(KEYSTORE ${CMAKE_CURRENT_BINARY_DIR}/debug.keystore)
     add_custom_command(OUTPUT ${KEYSTORE}
                        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-                       COMMAND ${JAVA_BIN}/keytool -genkey -keystore ${KEYSTORE} -storepass android -alias androiddebugkey -keypass android -keyalg RSA -keysize 2048 -validity 10000 -dname "CN=, OU=, O=, L=, S=, C=")
+                       COMMAND ${JAVA_BIN}/keytool -genkey -keystore ${KEYSTORE} -storepass android -alias rdocandroidkey -keypass android -keyalg RSA -keysize 2048 -validity 10000 -dname "CN=, OU=, O=, L=, S=, C=")
 
     # APK_VERSION_CODE corresponds to android:versionCode, an internal integer value that can be queried. Higher numbers indicate more recent versions.
     # APK_VERSION_NAME corresponds to android:versionName, a string value that is displayed to the user.
@@ -184,7 +184,7 @@ if(ANDROID)
                        COMMAND ${BUILD_TOOLS}/dx${TOOL_SCRIPT_EXTENSION} --dex --output=bin/classes.dex ./obj
                        COMMAND ${BUILD_TOOLS}/aapt package -f -M AndroidManifest.xml --version-code ${APK_VERSION_CODE} --version-name ${APK_VERSION_NAME} -S res -I ${ANDROID_JAR} -F RenderDocCmd-unaligned.apk bin libs
                        COMMAND ${BUILD_TOOLS}/zipalign -f 4 RenderDocCmd-unaligned.apk RenderDocCmd.apk
-                       COMMAND ${BUILD_TOOLS}/apksigner${TOOL_SCRIPT_EXTENSION} sign --ks ${KEYSTORE} --ks-pass pass:android --key-pass pass:android --ks-key-alias androiddebugkey RenderDocCmd.apk
+                       COMMAND ${BUILD_TOOLS}/apksigner${TOOL_SCRIPT_EXTENSION} sign --ks ${KEYSTORE} --ks-pass pass:android --key-pass pass:android --ks-key-alias rdocandroidkey RenderDocCmd.apk
                        COMMAND ${CMAKE_COMMAND} -E copy RenderDocCmd.apk ${APK_FILE})
 
 endif()
diff --git a/util/buildscripts/scripts/make_package_win32.sh b/util/buildscripts/scripts/make_package_win32.sh
index 20fe43f86..a01f938eb 100755
--- a/util/buildscripts/scripts/make_package_win32.sh
+++ b/util/buildscripts/scripts/make_package_win32.sh
@@ -80,9 +80,9 @@ fi
 
 # Generate a debug key for signing purposes
 if [ -f "$JAVA_HOME/bin/keytool.exe" ] && [ -d dist/Release64/plugins/android ]; then
-	"$JAVA_HOME/bin/keytool.exe" -genkey -keystore dist/Release64/plugins/android/renderdoc.keystore -storepass android -alias androiddebugkey -keypass android -keyalg RSA -keysize 2048 -validity 10000 -dname "CN=, OU=, O=, L=,  S=, C="
+	"$JAVA_HOME/bin/keytool.exe" -genkey -keystore dist/Release64/plugins/android/renderdoc.keystore -storepass android -alias rdocandroidkey -keypass android -keyalg RSA -keysize 2048 -validity 10000 -dname "CN=, OU=, O=, L=,  S=, C="
 elif [ -f "$JAVA_HOME/bin/keytool" ] && [ -d dist/Release64/plugins/android ]; then
-	"$JAVA_HOME/bin/keytool" -genkey -keystore dist/Release64/plugins/android/renderdoc.keystore -storepass android -alias androiddebugkey -keypass android -keyalg RSA -keysize 2048 -validity 10000 -dname "CN=, OU=, O=, L=,  S=, C="
+	"$JAVA_HOME/bin/keytool" -genkey -keystore dist/Release64/plugins/android/renderdoc.keystore -storepass android -alias rdocandroidkey -keypass android -keyalg RSA -keysize 2048 -validity 10000 -dname "CN=, OU=, O=, L=,  S=, C="
 fi
 
 if [ -d dist/Release64/plugins/android ]; then