Merge branch 'multiple-android-architectures'

2 files changed, 27 insertions, 21 deletions

diff --git a/android/build.gradle b/android/build.gradle
index e6b15979fb..4ee2ce7bd3 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -8,6 +8,13 @@ def repoRootPath = projectDir.absoluteFile.parentFile.absolutePath
 def extraAssetsDirectory = "$project.buildDir/extraAssets"
 def extraJniDirectory = "$project.buildDir/extraJni"
 
+def keystorePropertiesFile = file('keystore.properties')
+def keystoreProperties = new Properties()
+
+if (keystorePropertiesFile.exists()) {
+    keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+}
+
 android {
     compileSdkVersion 28
     buildToolsVersion '28.0.3'
@@ -20,10 +27,22 @@ android {
         versionName "2019.1"
     }
 
-    buildTypes {
-        release {
-            minifyEnabled true
-            proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
+    if (keystorePropertiesFile.exists()) {
+        signingConfigs {
+            release {
+                keyAlias keystoreProperties['keyAlias']
+                keyPassword keystoreProperties['keyPassword']
+                storeFile file(keystoreProperties['storeFile'])
+                storePassword keystoreProperties['storePassword']
+            }
+        }
+
+        buildTypes {
+            release {
+                minifyEnabled true
+                proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
+                signingConfig signingConfigs.release
+            }
         }
     }
 
@@ -43,11 +62,6 @@ android {
         variant.mergeAssetsProvider.configure {
             dependsOn copyApiRootCertificate
         }
-
-        variant.ndkCompileProvider.configure {
-            dependsOn copyMullvadJni
-            dependsOn copyWireguardGo
-        }
     }
 }
 
@@ -95,18 +109,6 @@ task format(type: FormatTask, group: 'formatting') {
 
 lint.dependsOn lintKotlin
 
-task copyMullvadJni(type: Copy) {
-    from "$repoRootPath/target/aarch64-linux-android/debug"
-    include 'libmullvad_jni.so'
-    into "$extraJniDirectory/arm64-v8a"
-}
-
-task copyWireguardGo(type: Copy) {
-    from "$repoRootPath/dist-assets/binaries/aarch64-linux-android"
-    include 'libwg.so'
-    into "$extraJniDirectory/arm64-v8a"
-}
-
 task copyApiRootCertificate(type: Copy) {
     from "$repoRootPath/dist-assets"
     include "api_root_ca.pem"
diff --git a/android/proguard-rules.pro b/android/proguard-rules.pro
index f6a2ef15e0..a50d295303 100644
--- a/android/proguard-rules.pro
+++ b/android/proguard-rules.pro
@@ -1 +1,5 @@
 -dontwarn org.joda.convert.**
+
+-keep class net.mullvad.mullvadvpn.model.** { *; }
+-keep class net.mullvad.mullvadvpn.MullvadDaemon { *; }
+-keep class net.mullvad.mullvadvpn.MullvadVpnService { *; }