From 862b39d392425c79b02adcc645d49cb829f5eb4e Mon Sep 17 00:00:00 2001
From: Remek Zajac <remek@airmap.com>
Date: Wed, 19 Aug 2020 17:26:52 +0200
Subject: [PATCH] use QGC_ANDROID_PACKAGE

---
 android.pri                 | 2 +-
 android/AndroidManifest.xml | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/android.pri b/android.pri
index 2355bc934..3962196ca 100644
--- a/android.pri
+++ b/android.pri
@@ -15,7 +15,7 @@ exists($$PWD/custom/android) {
     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
+            $$QMAKE_STREAM_EDITOR -i \"s/package=\\\"org.mavlink.qgroundcontrol\\\"/package=\\\"$$QGC_ANDROID_PACKAGE\\\"/\" $$ANDROID_PACKAGE_SOURCE_DIR/AndroidManifest.xml
     android_source_dir_target.depends = FORCE
 }
 
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index c3571cac7..46bebf0fa 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -82,4 +82,3 @@
     <!-- %%INSERT_FEATURES -->
 
 </manifest>
-
-- 
2.22.0