From ce656ca37473dad2e1f2bfff440c8d347c5e5618 Mon Sep 17 00:00:00 2001
From: "Dr. Tobias Quathamer" <toddy@debian.org>
Date: Mon, 6 Feb 2017 11:51:54 +0100
Subject: [PATCH] Remove unneeded AndroidManifest.xml files and 'foss' build
 type.

This also drops the permissions ACCESS_COARSE_LOCATION
and ACCESS_FINE_LOCATION which are not used currently.
---
 MessengerProj/build.gradle                    | 18 --------------
 .../config/debug/AndroidManifest.xml          | 24 -------------------
 MessengerProj/config/foss/AndroidManifest.xml | 17 -------------
 .../config/release/AndroidManifest.xml        | 24 -------------------
 4 files changed, 83 deletions(-)
 delete mode 100644 MessengerProj/config/debug/AndroidManifest.xml
 delete mode 100644 MessengerProj/config/foss/AndroidManifest.xml
 delete mode 100644 MessengerProj/config/release/AndroidManifest.xml

diff --git a/MessengerProj/build.gradle b/MessengerProj/build.gradle
index 5ef1a280d..e6c6edb5f 100644
--- a/MessengerProj/build.gradle
+++ b/MessengerProj/build.gradle
@@ -74,12 +74,6 @@ android {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
-
-        foss {
-            debuggable false
-            jniDebuggable false
-            signingConfig signingConfigs.release
-        }
     }
 
     defaultConfig.versionCode = 15
@@ -89,18 +83,6 @@ android {
         jni.srcDirs = [] //disable automatic ndk-build call
     }
 
-    sourceSets.debug {
-        manifest.srcFile 'config/debug/AndroidManifest.xml'
-    }
-
-    sourceSets.release {
-        manifest.srcFile 'config/release/AndroidManifest.xml'
-    }
-
-    sourceSets.foss {
-        manifest.srcFile 'config/foss/AndroidManifest.xml'
-    }
-
     productFlavors {
         x86 {
             ndk {
diff --git a/MessengerProj/config/debug/AndroidManifest.xml b/MessengerProj/config/debug/AndroidManifest.xml
deleted file mode 100644
index e86a4558a..000000000
--- a/MessengerProj/config/debug/AndroidManifest.xml
+++ /dev/null
@@ -1,24 +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="com.b44t.messenger"
-    android:installLocation="auto">
-
-    <uses-feature android:name="android.hardware.location.gps" android:required="false" />
-    <uses-feature android:name="android.hardware.location.network" android:required="false" />
-    <uses-feature android:name="android.hardware.location" android:required="false" />
-    <uses-feature android:name="android.hardware.LOCATION" android:required="false" />
-
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <application
-        android:allowBackup="false"
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/AppName"
-        android:theme="@style/Theme.MessengerProj.Start"
-        android:name=".ApplicationLoader"
-        android:hardwareAccelerated="@bool/useHardwareAcceleration"
-        android:largeHeap="true">
-    </application>
-
-</manifest>
diff --git a/MessengerProj/config/foss/AndroidManifest.xml b/MessengerProj/config/foss/AndroidManifest.xml
deleted file mode 100644
index 557f4158e..000000000
--- a/MessengerProj/config/foss/AndroidManifest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.b44t.messenger"
-    android:installLocation="auto">
-
-    <application
-        android:allowBackup="false"
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/AppName"
-        android:theme="@style/Theme.MessengerProj.Start"
-        android:name=".ApplicationLoader"
-        android:hardwareAccelerated="@bool/useHardwareAcceleration"
-        android:largeHeap="true">
-
-    </application>
-
-</manifest>
diff --git a/MessengerProj/config/release/AndroidManifest.xml b/MessengerProj/config/release/AndroidManifest.xml
deleted file mode 100644
index e86a4558a..000000000
--- a/MessengerProj/config/release/AndroidManifest.xml
+++ /dev/null
@@ -1,24 +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="com.b44t.messenger"
-    android:installLocation="auto">
-
-    <uses-feature android:name="android.hardware.location.gps" android:required="false" />
-    <uses-feature android:name="android.hardware.location.network" android:required="false" />
-    <uses-feature android:name="android.hardware.location" android:required="false" />
-    <uses-feature android:name="android.hardware.LOCATION" android:required="false" />
-
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <application
-        android:allowBackup="false"
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/AppName"
-        android:theme="@style/Theme.MessengerProj.Start"
-        android:name=".ApplicationLoader"
-        android:hardwareAccelerated="@bool/useHardwareAcceleration"
-        android:largeHeap="true">
-    </application>
-
-</manifest>