m7n: local build modifications

Use custom application id: eu.m7n.wireguard.android
Set app names to (m7n.eu) WireGuard and (m7n.eu) WireGuard β
Limit ABIs to arm64-v8a and x86_64
Use NDK 21.3

4 files changed, 21 insertions, 3 deletions

diff --git a/tunnel/build.gradle b/tunnel/build.gradle
index ff1aad19..91217f39 100644
--- a/tunnel/build.gradle
+++ b/tunnel/build.gradle
@@ -47,6 +47,15 @@ android {
         disable('LongLogTag')
         disable('NewApi') // Desugaring!
     }
+    ndkVersion "21.3.6528147"
+    splits {
+        abi {
+            enable true
+            reset()
+            include "arm64-v8a", "x86_64"
+            universalApk false
+        }
+    }
 }
 
 dependencies {
diff --git a/ui/build.gradle b/ui/build.gradle
index 2bbbe539..f5fb22b3 100644
--- a/ui/build.gradle
+++ b/ui/build.gradle
@@ -19,7 +19,7 @@ android {
         viewBinding = true
     }
     defaultConfig {
-        applicationId 'com.wireguard.android'
+        applicationId 'eu.m7n.wireguard.android'
         minSdkVersion 21
         targetSdkVersion 30
         versionCode wireguardVersionCode
@@ -31,6 +31,14 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
         coreLibraryDesugaringEnabled = true
     }
+    splits {
+        abi {
+            enable true
+            reset()
+            include "arm64-v8a", "x86_64"
+            universalApk false
+        }
+    }
     if (keystorePropertiesFile.exists()) {
         final def keystoreProperties = new Properties()
         keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
@@ -60,6 +68,7 @@ android {
         warning('MissingTranslation')
         warning('ImpliedQuantity')
     }
+    ndkVersion "21.3.6528147"
 }
 
 dependencies {
diff --git a/ui/src/debug/res/values/strings.xml b/ui/src/debug/res/values/strings.xml
index 947b7381..af58a39d 100644
--- a/ui/src/debug/res/values/strings.xml
+++ b/ui/src/debug/res/values/strings.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name" translatable="false">WireGuard β</string>
+    <string name="app_name" translatable="false">(m7n.eu) WireGuard β</string>
 </resources>
diff --git a/ui/src/main/res/values/strings.xml b/ui/src/main/res/values/strings.xml
index 6c090199..fb6fad4b 100644
--- a/ui/src/main/res/values/strings.xml
+++ b/ui/src/main/res/values/strings.xml
@@ -63,7 +63,7 @@
     <string name="allow_remote_control_intents_summary_on">External apps may toggle tunnels (advanced)</string>
     <string name="allow_remote_control_intents_title">Allow remote control apps</string>
     <string name="allowed_ips">Allowed IPs</string>
-    <string name="app_name" translatable="false">WireGuard</string>
+    <string name="app_name" translatable="false">(m7n.eu) WireGuard</string>
     <string name="bad_config_context">%1$s\'s %2$s</string>
     <string name="bad_config_context_top_level">%s</string>
     <string name="bad_config_error">%1$s in %2$s</string>