From 3331a8ad43c3f147606256c4c243629271ce692a Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Wed, 6 Feb 2019 13:00:49 -0800
Subject: [PATCH] Removing signing configs for frame player apps

---
 android/apps/framePlayer/build.gradle      | 25 +++++++---------------
 android/apps/questFramePlayer/build.gradle | 25 +++++++---------------
 2 files changed, 16 insertions(+), 34 deletions(-)

diff --git a/android/apps/framePlayer/build.gradle b/android/apps/framePlayer/build.gradle
index a210c8300e..5bf8176863 100644
--- a/android/apps/framePlayer/build.gradle
+++ b/android/apps/framePlayer/build.gradle
@@ -1,15 +1,8 @@
+import com.android.builder.core.BuilderConstants
+
 apply plugin: 'com.android.application'
 
 android {
-    signingConfigs {
-        release {
-            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 : ''
-        }
-    }
-
     compileSdkVersion 28
     defaultConfig {
         applicationId "io.highfidelity.frameplayer"
@@ -32,19 +25,17 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            signingConfig signingConfigs.release
+    externalNativeBuild.cmake.path '../../../CMakeLists.txt'
+
+    variantFilter { variant ->
+        def build = variant.buildType.name
+        if (build == BuilderConstants.RELEASE) {
+            variant.setIgnore(true)
         }
     }
-
-    externalNativeBuild.cmake.path '../../../CMakeLists.txt'
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: '../../libraries/qt/libs')
-    //implementation project(':oculus')
     implementation project(':qt')
 }
diff --git a/android/apps/questFramePlayer/build.gradle b/android/apps/questFramePlayer/build.gradle
index 899f9cb955..f72b4c126e 100644
--- a/android/apps/questFramePlayer/build.gradle
+++ b/android/apps/questFramePlayer/build.gradle
@@ -1,15 +1,8 @@
+import com.android.builder.core.BuilderConstants
+
 apply plugin: 'com.android.application'
 
 android {
-    signingConfigs {
-        release {
-            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 : ''
-        }
-    }
-
     compileSdkVersion 28
     defaultConfig {
         applicationId "io.highfidelity.frameplayer"
@@ -22,7 +15,6 @@ android {
                     '-DHIFI_ANDROID_APP=questFramePlayer',
                     '-DANDROID_TOOLCHAIN=clang',
                     '-DANDROID_STL=c++_shared',
-
                     '-DCMAKE_VERBOSE_MAKEFILE=ON'
                 targets = ['questFramePlayer']
             }
@@ -33,15 +25,14 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            signingConfig signingConfigs.release
+    externalNativeBuild.cmake.path '../../../CMakeLists.txt'
+
+    variantFilter { variant ->
+        def build = variant.buildType.name
+        if (build == BuilderConstants.RELEASE) {
+            variant.setIgnore(true)
         }
     }
-
-    externalNativeBuild.cmake.path '../../../CMakeLists.txt'
 }
 
 dependencies {