Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
862b39d3
Commit
862b39d3
authored
Aug 19, 2020
by
Remek Zajac
Browse files
use QGC_ANDROID_PACKAGE
parent
816aa85b
Changes
2
Hide whitespace changes
Inline
Side-by-side
android.pri
View file @
862b39d3
...
...
@@ -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
}
...
...
android/AndroidManifest.xml
View file @
862b39d3
...
...
@@ -82,4 +82,3 @@
<!-- %%INSERT_FEATURES -->
</manifest>
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment