From: Tobias Brunner <tobias@strongswan.org>
Date: Fri, 22 Jul 2022 08:22:05 +0000 (+0200)
Subject: android: Move package namespace declaration from Manifest to build file
X-Git-Tag: 5.9.8rc1~12
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=6ab9297b5d5d9e14753c46f20a9c0ae2584b4e9e;p=thirdparty%2Fstrongswan.git

android: Move package namespace declaration from Manifest to build file
---

diff --git a/src/frontends/android/app/build.gradle b/src/frontends/android/app/build.gradle
index 8a0402accf..d31e0004a6 100644
--- a/src/frontends/android/app/build.gradle
+++ b/src/frontends/android/app/build.gradle
@@ -3,6 +3,8 @@ apply plugin: 'com.android.application'
 android {
     compileSdkVersion 30
 
+    namespace 'org.strongswan.android'
+
     defaultConfig {
         applicationId "org.strongswan.android"
         minSdkVersion 15
diff --git a/src/frontends/android/app/src/main/AndroidManifest.xml b/src/frontends/android/app/src/main/AndroidManifest.xml
index 4b0a398f81..be9bfbe57e 100644
--- a/src/frontends/android/app/src/main/AndroidManifest.xml
+++ b/src/frontends/android/app/src/main/AndroidManifest.xml
@@ -17,8 +17,7 @@
     for more details.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="org.strongswan.android">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />