From 816aa85b969bdb273bd9cbebcc08936179f738bb Mon Sep 17 00:00:00 2001
From: Remek Zajac <remek@airmap.com>
Date: Mon, 17 Aug 2020 22:18:22 +0200
Subject: [PATCH] Do no duplicate AndroidManifest.xml, yet allow supplying it
 and the java sources

---
 android.pri                                   | 17 ++--
 android/AndroidManifest.xml                   |  1 +
 custom-example/android/AndroidManifest.xml    | 84 -------------------
 .../qgroundcontrol/CustomQGCActivity.java     |  5 --
 custom-example/custom.pri                     |  1 +
 5 files changed, 12 insertions(+), 96 deletions(-)
 delete mode 100644 custom-example/android/AndroidManifest.xml
 delete mode 100644 custom-example/android/src/org/custom/qgroundcontrol/CustomQGCActivity.java

diff --git a/android.pri b/android.pri
index 83f574f22..2355bc934 100644
--- a/android.pri
+++ b/android.pri
@@ -3,17 +3,20 @@ message("Adding Serial Java Classes")
 QT += androidextras
 
 ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
+
 exists($$PWD/custom/android) {
     message("Merging $$PWD/custom/android/ -> $$PWD/android/")
+
     ANDROID_PACKAGE_SOURCE_DIR = $$OUT_PWD/ANDROID_PACKAGE_SOURCE_DIR
+    android_source_dir_target.target = android_source_dir
+    PRE_TARGETDEPS += $$android_source_dir_target.target
+    QMAKE_EXTRA_TARGETS += android_source_dir_target
 
-    javaforce.target = custom_android
-    javaforce.commands = $$QMAKE_MKDIR $$ANDROID_PACKAGE_SOURCE_DIR && \
-                         $$QMAKE_COPY_DIR $$PWD/android/* $$OUT_PWD/ANDROID_PACKAGE_SOURCE_DIR && \
-                         $$QMAKE_COPY_DIR $$PWD/custom/android/* $$OUT_PWD/ANDROID_PACKAGE_SOURCE_DIR
-    javaforce.depends = FORCE
-    PRE_TARGETDEPS += $$javaforce.target
-    QMAKE_EXTRA_TARGETS += javaforce
+    android_source_dir_target.commands = $$QMAKE_MKDIR $$ANDROID_PACKAGE_SOURCE_DIR && \
+            $$QMAKE_COPY_DIR $$PWD/android/* $$OUT_PWD/ANDROID_PACKAGE_SOURCE_DIR && \
+            $$QMAKE_COPY_DIR $$PWD/custom/android/* $$OUT_PWD/ANDROID_PACKAGE_SOURCE_DIR && \
+            $$QMAKE_STREAM_EDITOR -i \"s/package="org.mavlink.qgroundcontrol"/package=\"$$QGC_ORG_DOMAIN.qgroundcontrol\"/\" $$ANDROID_PACKAGE_SOURCE_DIR/AndroidManifest.xml
+    android_source_dir_target.depends = FORCE
 }
 
 exists($$PWD/custom/android/AndroidManifest.xml) {
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 46bebf0fa..c3571cac7 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -82,3 +82,4 @@
     <!-- %%INSERT_FEATURES -->
 
 </manifest>
+
diff --git a/custom-example/android/AndroidManifest.xml b/custom-example/android/AndroidManifest.xml
deleted file mode 100644
index e6a349cb5..000000000
--- a/custom-example/android/AndroidManifest.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0"?>
-<manifest package="org.custom.qgroundcontrol" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="-- %%INSERT_VERSION_NAME%% --" android:versionCode="-- %%INSERT_VERSION_CODE%% --" android:installLocation="auto">
-    <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="-- %%INSERT_APP_NAME%% --" android:icon="@drawable/icon">
-        <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation" android:name=".CustomQGCActivity" android:label="-- %%INSERT_APP_NAME%% --" android:screenOrientation="sensorLandscape" android:launchMode="singleTask" android:keepScreenOn="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
-                <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"/>
-                <action android:name="android.hardware.usb.action.USB_DEVICE_DETACHED"/>
-                <action android:name="android.bluetooth.device.action.ACL_CONNECTED" />
-                <action android:name="android.bluetooth.device.action.ACL_DISCONNECTED" />
-                <action android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED"/>
-            </intent-filter>
-
-            <meta-data android:resource="@xml/device_filter" android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"/>
-            <meta-data android:resource="@xml/device_filter" android:name="android.hardware.usb.action.USB_DEVICE_DETACHED"/>
-            <meta-data android:resource="@xml/device_filter" android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED"/>
-            <!-- Rest of Standard Manifest -->
-            <meta-data android:name="android.app.lib_name" android:value="-- %%INSERT_APP_LIB_NAME%% --"/>
-            <meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/>
-            <meta-data android:name="android.app.repository" android:value="default"/>
-            <meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/>
-            <meta-data android:name="android.app.bundled_libs_resource_id" android:resource="@array/bundled_libs"/>
-            <!-- Deploy Qt libs as part of package -->
-            <meta-data android:name="android.app.bundle_local_qt_libs" android:value="-- %%BUNDLE_LOCAL_QT_LIBS%% --"/>
-            <meta-data android:name="android.app.bundled_in_lib_resource_id" android:resource="@array/bundled_in_lib"/>
-            <meta-data android:name="android.app.bundled_in_assets_resource_id" android:resource="@array/bundled_in_assets"/>
-            <!-- Run with local libs -->
-            <meta-data android:name="android.app.use_local_qt_libs" android:value="-- %%USE_LOCAL_QT_LIBS%% --"/>
-            <meta-data android:name="android.app.libs_prefix" android:value="/data/local/tmp/qt/"/>
-            <meta-data android:name="android.app.load_local_libs" android:value="-- %%INSERT_LOCAL_LIBS%% --"/>
-            <meta-data android:name="android.app.load_local_jars" android:value="-- %%INSERT_LOCAL_JARS%% --"/>
-            <meta-data android:name="android.app.static_init_classes" android:value="-- %%INSERT_INIT_CLASSES%% --"/>
-            <!--  Messages maps -->
-            <meta-data android:value="@string/ministro_not_found_msg" android:name="android.app.ministro_not_found_msg"/>
-            <meta-data android:value="@string/ministro_needed_msg" android:name="android.app.ministro_needed_msg"/>
-            <meta-data android:value="@string/fatal_error_msg" android:name="android.app.fatal_error_msg"/>
-            <!--  Messages maps -->
-
-            <!-- Splash screen -->
-            <!--
-            <meta-data android:name="android.app.splash_screen_drawable" android:resource="@drawable/logo"/>
-            -->
-            <!-- Splash screen -->
-
-            <!-- Background running -->
-            <!-- Warning: changing this value to true may cause unexpected crashes if the
-                          application still try to draw after
-                          "applicationStateChanged(Qt::ApplicationSuspended)"
-                          signal is sent! -->
-            <meta-data android:name="android.app.background_running" android:value="false"/>
-            <!-- Background running -->
-        </activity>
-    </application>
-    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28"/>
-
-    <!-- Needed to keep working while 'asleep' -->
-    <uses-permission android:name="android.permission.WAKE_LOCK"/>
-
-    <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
-         Remove the comment if you do not require these default permissions. -->
-    <!-- %%INSERT_PERMISSIONS -->
-
-    <!-- Support devices without USB host mode since there are other connection types -->
-    <uses-feature android:name="android.hardware.usb.host" android:required="false"/>
-
-    <!-- Support devices without Bluetooth since there are other connection types -->
-    <uses-feature android:name="android.hardware.bluetooth" android:required="false"/>
-
-    <!-- Support devices that don't have location services -->
-    <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.usb.accessory"/>
-
-	<uses-permission android:name="android.permission.INTERNET" />
-	<uses-permission android:name="android.permission.WRITE_INTERNAL_STORAGE" />
-	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-
-    <!-- The following comment will be replaced upon deployment with default features based on the dependencies of the application.
-         Remove the comment if you do not require these default features. -->
-    <!-- %%INSERT_FEATURES -->
-
-</manifest>
diff --git a/custom-example/android/src/org/custom/qgroundcontrol/CustomQGCActivity.java b/custom-example/android/src/org/custom/qgroundcontrol/CustomQGCActivity.java
deleted file mode 100644
index c224ea748..000000000
--- a/custom-example/android/src/org/custom/qgroundcontrol/CustomQGCActivity.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.custom.qgroundcontrol;
-
-import org.mavlink.qgroundcontrol.QGCActivity;
-
-public class CustomQGCActivity extends QGCActivity {}
diff --git a/custom-example/custom.pri b/custom-example/custom.pri
index c5325f553..cc233b283 100644
--- a/custom-example/custom.pri
+++ b/custom-example/custom.pri
@@ -45,6 +45,7 @@ QGC_APP_NAME        = "Custom QGroundControl"
 QGC_BINARY_NAME     = "CustomQGroundControl"
 QGC_ORG_NAME        = "Custom"
 QGC_ORG_DOMAIN      = "org.custom"
+QGC_ANDROID_PACKAGE = "org.custom.qgroundcontrol"
 QGC_APP_DESCRIPTION = "Custom QGroundControl"
 QGC_APP_COPYRIGHT   = "Copyright (C) 2020 QGroundControl Development Team. All rights reserved."
 
-- 
2.22.0