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_mY|W&~sY#JrTE{LGY;)TGk%?9@u2c;p(BswY4-y9}C`wi)oTacQ$L
zvM_2f2{JOWGO#o;Eo$YgQD6S-|NANLzArjk`q;U8+Q;_gXK!dsj6A(t{p~fkcFDKg
zYc(GCUEzzrrY2Czp!r<w*Yx6=4>Nh%l`8o%?pt4Ijj=7^5_x}n2lG>R_9-H}wk>^D
z@hZgo>@@aMn?wQ+pDRDJLiPK`dm5r?eV)upfk$uNo%#7E$1KK{dwZ6ubGumW>f^s-
zx$Hv8QL*M-TN<Le`5tT+Iii24vxb#h!sE$pxo$xoM(@=33k?b$#w0!8s$g$spHd@!
zLUg+NjRo>wxwbMZ+&g2qm)BEam8b0@!?#l_KYff2*y0u8wdN(C$<IZax98p{OZ7Oi
z`4RI!(QvEAm=M|JT6?C>%~qYiGlA=4aF5C|OO@GnZYx8S+E`D&NKV$y-Qlw(FX)HT
z+$!;S*88pZWISGOz0i~5a7ckimf1wJ?aiLc?;9oBHy&nO(EN2(*~7bQ&L3QM-F@+*
zGoNEFT)MI#ZNc=#*%8h<%}#O;%Tgl(AB7fJ)ZdkUe<k@f`@w_$pIIcV?`d?%AO6nz
zl-0R+FC&|TM5oN;!pMJ~tMu$XFO^sNxy*DCTZ*C6p7hG(rYZZLt_sxSO3*joz2)xt
zKOGW^@7t&Bjren4P}JgM_rZtmi~k3A8o%S}|0{0p9$Ud=VjSkRA^q5mbyH&Nmlggs
zXUO-{FboSjF>hOE-t-{N_}kMKKVlJRk(Xv`w=xlSoa?bkIfx}-p7fa&vNAJ{ZIt0(
zFem@e5%(_#)L8yCY<Z{}vd7zWsYXHjiKrV2?v019cKe>}h&iA1OI3gW%3zPOMW+K@
z8Fsw(t7(|{aiebQBvXURhkvFk%QEbDcA4;_XNBf(>2EHk=8I*&=ksq04y{<QVw%U1
zdT-Wk(+j>SyxG50$(mb9<=gfBExB=BNd>3uc~su6*pzozd+(d6j%<^}Klt&0lQwIF
zo~eN)FhM^wXkxqz#BNNCj0U`HoLX%jZQpr;shO3*z}!&GK!lAsl!cjx*AbEx6kI@g
z!B7C0^nv1BJnT?$Lv903kO-SFQ)sY(oH(zcxq+dfxuK!4v8j2KIIjta3q)Wp`35)6
zM|LAH%P}|hG8i;=GBq|b>}9P^z9x8M{ww{M?Dg{u9A_Oqd1<BMpN?+kl{{?gb_*+R
z>pE$izj$?Tg1*lApYl^$&NY?HV>;OVDyl#7>yj|HN%70gX8y5~$o!D6dw&@>kBqvl
z(fge->zE$ob$7|-?BUGJjeVom8reN{frZtAat;fz%ZsPh&t_y_BvkhH`8!4?W=00|
zAY=x*E9GCae~s7n->360n6vV)i{g9Gu-3z+^w$D@wj)zwh22?qTre_Qc&e65RM$o^
z`G7Eg_tcU(TZ=BG6z;t`F^Or_8_OQEym@DzA7Qm+S(dm_edD|0pxPrXU*mj_wPgqi
z|1UZD`R*Bq$9vbZ=N6SepZ7xF^#A_gybG?sF02&V^vCM%`HMBOM*hEl1=(Lc{6n<P
JlU?r9UI4`j3_Ab-

literal 0
HcmV?d00001