From c18edcdab4c4b7148ca6a1257a955f7b8b7475b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Thu, 16 Mar 2017 13:13:30 +0100
Subject: [PATCH] gradle: Add a new build config with debug signing but release
 optimization.

Add a fixed debug keystore so debug key is effectively the same on all my computers,
making testing more convenient.
---
 android/build.gradle   |  26 ++++++++++++++++++--------
 android/debug.keystore | Bin 0 -> 1259 bytes
 2 files changed, 18 insertions(+), 8 deletions(-)
 create mode 100644 android/debug.keystore

diff --git a/android/build.gradle b/android/build.gradle
index 382178f57f..1d0e8f9c2d 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -2,7 +2,13 @@ apply plugin: 'com.android.application'
 
 android {
 	signingConfigs {
-		config {
+		debug {
+			storeFile file("debug.keystore")
+		}
+		optimized {
+			storeFile file("debug.keystore")
+		}
+		release {
 		}
 	}
 	compileSdkVersion 25
@@ -14,16 +20,22 @@ android {
 		ndk {
 			abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
 		}
-		signingConfig signingConfigs.config
+		signingConfig signingConfigs.debug
 	}
 	buildTypes {
-		release {
-			minifyEnabled = false
-			signingConfig signingConfigs.config
-		}
 		debug {
 			minifyEnabled = false
 			jniDebuggable true
+			signingConfig signingConfigs.debug
+		}
+		release {
+			minifyEnabled = false
+			signingConfig signingConfigs.release
+		}
+		optimized {
+			// Debug signed but optimized.
+			minifyEnabled = false
+			signingConfig android.buildTypes.debug.signingConfig
 		}
 	}
 	externalNativeBuild {
@@ -48,7 +60,6 @@ android {
 	productFlavors {
 		normal {
 			applicationId 'org.ppsspp.ppsspp'
-			signingConfig signingConfigs.config
 			externalNativeBuild {
 				cmake {
 					// Available arguments listed at https://developer.android.com/ndk/guides/cmake.html
@@ -63,7 +74,6 @@ android {
 		}
 		gold {
 			applicationId 'org.ppsspp.ppssppgold'
-			signingConfig signingConfigs.config
 			externalNativeBuild {
 				cmake {
 					// Available arguments listed at https://developer.android.com/ndk/guides/cmake.html
diff --git a/android/debug.keystore b/android/debug.keystore
new file mode 100644
index 0000000000000000000000000000000000000000..abec2013225f5887e590b76ea5e67d4ab73c38b5
GIT binary patch
literal 1259
zcmezO_TO6u1_mYu1_nkj=1<H^Day}GNl8sAP0voPWME*7Tw_x8gn@x+mq8QLHUmC3
zE^RhO7Dg>5K}JSa29_qKMXj7Q>dT+~e?R5j_eEz*A3Il1``Etx><x{Hk*9a7zrE(x
zF8P*wt;XZND}3?S)C5WyG@q;enqFM<VJ1(zQYBx;ed`OYF}5XKBJXeSV1DY(K1F2L
zwx!Q1UWIs{oyLA@lSts<bLD4NsD9sgPeU}V&y!gx@aWCEGe7_2n8ny~Z_iS7ZWpUv
zef)PUmt811D%QMfOG8vQ--GQUNAwSM*06F*cs#i+*Dc7y=$-n0p+UjJn55@h73|II
zQ)<Ldh)!3(u|WPS*H&hQduI&y@_H()^0ZxK_;zaLr;pJATf8E?*1Y61`MF5*_S_p~
zsUAl*KVtqT8gA7X6C%4@YtPiV*{bt*CUAWW?onB0sWRKnZDoj38|&#8$;sNeJAAg}
z1^rN(TO}UPdcXCajK|BZ7kW}04k_@+GMi|&z1eg5eWOJC#>0#Yn!m0pdw6%v`Gd=@
zyDwgJ=5x%2OIH@8EttMIJHlC~*-7qUS!zV!qtF72`n%HauOz=_KX}mpGmC`vJ&g|e
z!{1q-vO4$fWn`0(=#-gU82Qh0m7d+_rSeKYmzgeNOEGlXlU|wJG-cn@Re^e33Hs){
zx7<Ddr$a*VefyNX5r6IriduZ^KKRgm@&DjX<9A&Bf5pw+V=I_UjKjP(q#wJnZc1$Z
zvckXS4EcT<hGAhR=56cDn;xVYe|y^EM=Sy@^3rVWRwlxZb3HaG2eAaqlRmRTR%XVr
zjWYZT=Hwqb;{N4;8q2?iEe};g_IR5v)hK8`5p_esz47qXZr_s~G3S$hsp{`v8SGKE
z=yaef!;aT}H4PI#Zq#j^WNJ|P@XvH*S%&@2E)#zAtkC=|{msSHe6j5JeEv<rp%n{O
zO!GKW@6Ebxdcik^H~W_=S#v9?e7nBCB{!}sso<17kILH>oAM58?|n1Xk!_Or2R|Ng
z(q@g&Gc~YeU|@V`(8PGxpo!6qiILHOmyJ`a&7<u*FC!x>D}#Z#p_qXP8*?ZNGY_vL
zBr7PmfbxQ&fB_#!oQsDYDsISazzGsz6J`nxHjoqNH8eLcG&DCfG&VLhj}qrK0dWnW
zT=ETWoR92AMpg#q#$E=4#!jZjMuxqt)ydZcZ_IzCACtX)o`K`6!zVATRQ%J?&AgI_
zZQX8R#cf?Djq?|;?oH6wIsa3BO3S&Xl6g!AyI)21M}A!r<~AvQx!KG=RuY*X@^$Yo
z<K~f3w>5gdGiDvrgS_r8xtu+mnYpoV)LJ9Er!KItT2RhmA$EE3)cV<s?2ClT-adcF
z$i&RZfF6X*jg1T`|C;@4yte;7oqxfcm496n--Cv=9xkQ77VxtjnG!4P&bs4*k=epi
zwOpdQHj2pyg!#Ltmdx2&bSb59@70M(Osn2l_L$|(JNx_yt1Zj2#Et43-xUYd9%=a+
z=X<OzLrD04$;r=m&p15ZyOuq-sQmf77y73E_Xp=)aQ$^*rO>87R(H=|tdTYH|NSe-
Q{_5c$qII6^a-a4B0L2LmI{*Lx

literal 0
HcmV?d00001