[Android] Fix manifest merger error in release builds

[Nicolas Pomepuy]

vlc-android | branch: master | Nicolas Pomepuy <nicolas at videolabs.io> | Thu Apr 30 11:56:10 2020 +0200| [09f888edf0d42724d8a56d6dd058ac0b0c020d9e] | committer: Nicolas Pomepuy

Fix manifest merger error in release builds

> https://code.videolan.org/videolan/vlc-android/commit/09f888edf0d42724d8a56d6dd058ac0b0c020d9e
---

 .../app/flavors/release/AndroidManifest.xml        | 53 ++++++++++++++++++++++
 .../flavors/release/AndroidManifest.xml            | 29 ------------
 2 files changed, 53 insertions(+), 29 deletions(-)

diff --git a/application/app/flavors/release/AndroidManifest.xml b/application/app/flavors/release/AndroidManifest.xml
new file mode 100644
index 000000000..95b60332d
--- /dev/null
+++ b/application/app/flavors/release/AndroidManifest.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ *************************************************************************
+  ~  AndroidManifest.xml
+  ~ **************************************************************************
+  ~ Copyright © 2020 VLC authors and VideoLAN
+  ~ Author: Nicolas POMEPUY
+  ~ This program is free software; you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation; either version 2 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program; if not, write to the Free Software
+  ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+  ~ ***************************************************************************
+  ~
+  ~
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="org.videolan.mobile.app">
+
+    <uses-permission android:name="android.permission.READ_LOGS" tools:node="remove" />
+
+    <!-- Extensions API permissions -->
+    <permission
+        android:name="org.videolan.vlc.permission.READ_EXTENSION_DATA"
+        android:protectionLevel="normal" />
+
+    <permission
+        android:name="org.videolan.vlc.permission.BIND_DATA_CONSUMER"
+        android:protectionLevel="normal" />
+
+    <uses-permission android:name="org.videolan.vlc.permission.READ_EXTENSION_DATA" />
+    <uses-permission android:name="org.videolan.vlc.permission.BIND_DATA_CONSUMER" />
+
+    <application>
+        <activity android:name=".gui.DebugLogActivity"
+            android:theme="@style/Theme.VLC"
+            android:launchMode="singleTop" />
+        <service android:name=".DebugLogService"
+            android:process=":logger" />
+    </application>
+
+</manifest>
diff --git a/application/vlc-android/flavors/release/AndroidManifest.xml b/application/vlc-android/flavors/release/AndroidManifest.xml
deleted file mode 100644
index af84f80be..000000000
--- a/application/vlc-android/flavors/release/AndroidManifest.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="org.videolan.vlc">
-
-    <uses-permission android:name="android.permission.READ_LOGS" tools:node="remove" />
-
-    <!-- Extensions API permissions -->
-    <permission
-        android:name="org.videolan.vlc.permission.READ_EXTENSION_DATA"
-        android:protectionLevel="normal" />
-
-    <permission
-        android:name="org.videolan.vlc.permission.BIND_DATA_CONSUMER"
-        android:protectionLevel="normal" />
-
-    <uses-permission android:name="org.videolan.vlc.permission.READ_EXTENSION_DATA" />
-    <uses-permission android:name="org.videolan.vlc.permission.BIND_DATA_CONSUMER" />
-
-    <application>
-        <activity android:name=".gui.DebugLogActivity"
-            android:theme="@style/Theme.VLC"
-            android:launchMode="singleTop" />
-        <service android:name=".DebugLogService"
-            android:process=":logger" />
-    </application>
-
-</manifest>