use QGC_ANDROID_PACKAGE

karikolehmainen · Aug 26, 2020 · 862b39d · 862b39d
1 parent 816aa85
commit 862b39d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git 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
@@ -82,4 +82,3 @@
     <!-- %%INSERT_FEATURES -->
 
 </manifest>
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -82,4 +82,3 @@
		<!-- %%INSERT_FEATURES -->

		</manifest>