From 6ab9297b5d5d9e14753c46f20a9c0ae2584b4e9e Mon Sep 17 00:00:00 2001
From: Tobias Brunner <tobias@strongswan.org>
Date: Fri, 22 Jul 2022 10:22:05 +0200
Subject: [PATCH] android: Move package namespace declaration from Manifest to
 build file

---
 src/frontends/android/app/build.gradle                 | 2 ++
 src/frontends/android/app/src/main/AndroidManifest.xml | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

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" />
-- 
2.47.2