From 8fdc0335b6c56e16b00ece739fc1b15b27ad5776 Mon Sep 17 00:00:00 2001
From: natinusala <natinusala@gmail.com>
Date: Mon, 8 Jul 2019 17:24:09 +0200
Subject: [PATCH 1/2] phoenix: move target and min SDK to gradle, fix missing
 signing config

---
 pkg/android/phoenix/AndroidManifest.xml | 4 +---
 pkg/android/phoenix/build.gradle        | 6 ++++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkg/android/phoenix/AndroidManifest.xml b/pkg/android/phoenix/AndroidManifest.xml
index 8fe3d21fe2..7d26af2296 100644
--- a/pkg/android/phoenix/AndroidManifest.xml
+++ b/pkg/android/phoenix/AndroidManifest.xml
@@ -10,9 +10,7 @@
     <uses-feature android:name="android.software.leanback" android:required="false" />
     <uses-feature android:name="android.hardware.gamepad" android:required="false"/>
     <uses-feature android:name="android.hardware.location.gps" android:required="false"/>
-    <uses-sdk
-        android:minSdkVersion="16"
-        android:targetSdkVersion="28" />
+
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.INTERNET" />
diff --git a/pkg/android/phoenix/build.gradle b/pkg/android/phoenix/build.gradle
index aa56eec493..32c9ede12f 100644
--- a/pkg/android/phoenix/build.gradle
+++ b/pkg/android/phoenix/build.gradle
@@ -31,6 +31,7 @@ android {
         arguments "-j${Runtime.runtime.availableProcessors()}"
       }
     }
+    targetSdkVersion 28
   }
 
   productFlavors {
@@ -86,6 +87,11 @@ android {
         keyPassword RELEASE_KEY_PASSWORD
       }
     }
+    else {
+      release {
+        // Use debug if you don't have RELEASE_STORE_FILE
+      }
+    }
   }
 
   buildTypes {

From 37de980f4d4240b7cc23357b0c932167c62c41ff Mon Sep 17 00:00:00 2001
From: natinusala <natinusala@gmail.com>
Date: Mon, 8 Jul 2019 17:25:06 +0200
Subject: [PATCH 2/2] phoenix: add Android Studio project to .gitignore

---
 pkg/android/phoenix/.gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkg/android/phoenix/.gitignore b/pkg/android/phoenix/.gitignore
index 3ca44edbb9..ebb4538796 100644
--- a/pkg/android/phoenix/.gitignore
+++ b/pkg/android/phoenix/.gitignore
@@ -1,3 +1,5 @@
 .gradle
 .externalNativeBuild
 build
+phoenix.iml
+