From 8c6166d6e5dbd92eda549693f6ca0ba4c63d2d5b Mon Sep 17 00:00:00 2001
From: Gabriel Calero <gcalero1984@gmail.com>
Date: Fri, 25 May 2018 17:42:41 -0300
Subject: [PATCH 1/2] Change gradle configuration to sign release apk. Remove
 Daydream intent from AndroidManifest

---
 android/app/build.gradle                 | 9 +++++++++
 android/app/src/main/AndroidManifest.xml | 6 ------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 70f7c622a0..5f92417ba4 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -27,6 +27,14 @@ android {
                     '-DDISABLE_KTX_CACHE=OFF'
             }
         }
+        signingConfigs {
+            release {
+                storeFile file(HIFI_ANDROID_KEYSTORE)
+                storePassword HIFI_ANDROID_KEYSTORE_PASSWORD
+                keyAlias HIFI_ANDROID_KEY_ALIAS
+                keyPassword HIFI_ANDROID_KEY_PASSWORD
+            }
+        }
     }
 
     compileOptions {
@@ -38,6 +46,7 @@ android {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.release
         }
     }
 
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index e105f5bccf..0b52046057 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -49,12 +49,6 @@
             android:label="@string/app_name"
             android:launchMode="singleTop"
             >
-
-            <intent-filter>
-                <category android:name="com.google.intent.category.DAYDREAM"/>
-                <action android:name="android.intent.action.MAIN" />
-            </intent-filter>
-
             <meta-data android:name="android.app.lib_name" android:value="native-lib"/>
             <meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/>
             <meta-data android:name="android.app.bundled_in_lib_resource_id" android:resource="@array/bundled_in_lib"/>

From a36c41fc139f195ca3ae8371c7b7b2aeeed4a197 Mon Sep 17 00:00:00 2001
From: Gabriel Calero <gcalero1984@gmail.com>
Date: Wed, 30 May 2018 12:43:44 -0300
Subject: [PATCH 2/2] Make APK release signature optional

---
 android/app/build.gradle | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 5f92417ba4..46de9642d9 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -29,10 +29,10 @@ android {
         }
         signingConfigs {
             release {
-                storeFile file(HIFI_ANDROID_KEYSTORE)
-                storePassword HIFI_ANDROID_KEYSTORE_PASSWORD
-                keyAlias HIFI_ANDROID_KEY_ALIAS
-                keyPassword HIFI_ANDROID_KEY_PASSWORD
+                storeFile project.hasProperty("HIFI_ANDROID_KEYSTORE") ? file(HIFI_ANDROID_KEYSTORE) : null
+                storePassword project.hasProperty("HIFI_ANDROID_KEYSTORE_PASSWORD") ? HIFI_ANDROID_KEYSTORE_PASSWORD : ''
+                keyAlias project.hasProperty("HIFI_ANDROID_KEY_ALIAS") ? HIFI_ANDROID_KEY_ALIAS : ''
+                keyPassword project.hasProperty("HIFI_ANDROID_KEY_PASSWORD") ? HIFI_ANDROID_KEY_PASSWORD : ''
             }
         }
     }
@@ -46,7 +46,10 @@ android {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            signingConfig signingConfigs.release
+            signingConfig project.hasProperty("HIFI_ANDROID_KEYSTORE") &&
+                    project.hasProperty("HIFI_ANDROID_KEYSTORE_PASSWORD") &&
+                    project.hasProperty("HIFI_ANDROID_KEY_ALIAS") &&
+                    project.hasProperty("HIFI_ANDROID_KEY_PASSWORD")? signingConfigs.release : null
         }
     }