From de03dadc3c594b4ee8ab33aabb1c4528112ba22c Mon Sep 17 00:00:00 2001 From: Remek Zajac Date: Fri, 7 Aug 2020 13:10:28 +0200 Subject: [PATCH] Allow custom AndroidManifest.xml and icons --- android.pri | 19 +++- custom-example/android/AndroidManifest.xml | 84 ++++++++++++++++++ .../android/res/drawable-ldpi/icon.png | Bin 0 -> 20526 bytes .../qgroundcontrol/CustomQGCActivity.java | 5 ++ 4 files changed, 107 insertions(+), 1 deletion(-) create mode 100644 custom-example/android/AndroidManifest.xml create mode 100644 custom-example/android/res/drawable-ldpi/icon.png create mode 100644 custom-example/android/src/org/custom/qgroundcontrol/CustomQGCActivity.java diff --git a/android.pri b/android.pri index 415594743..b282d988f 100644 --- a/android.pri +++ b/android.pri @@ -1,9 +1,26 @@ include($$PWD/libs/qtandroidserialport/src/qtandroidserialport.pri) 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 + + system($$QMAKE_MKDIR $$ANDROID_PACKAGE_SOURCE_DIR) + system($$QMAKE_COPY_DIR $$PWD/android/* $$OUT_PWD/ANDROID_PACKAGE_SOURCE_DIR) + system($$QMAKE_COPY_DIR $$PWD/custom/android/* $$OUT_PWD/ANDROID_PACKAGE_SOURCE_DIR) +} + +exists($$PWD/custom/android/AndroidManifest.xml) { + OTHER_FILES += \ + $$PWD/custom/android/AndroidManifest.xml +} else { + OTHER_FILES += \ + $$PWD/android/AndroidManifest.xml +} + OTHER_FILES += \ - $$PWD/android/AndroidManifest.xml \ $$PWD/android/res/xml/device_filter.xml \ $$PWD/android/src/com/hoho/android/usbserial/driver/CdcAcmSerialDriver.java \ $$PWD/android/src/com/hoho/android/usbserial/driver/CommonUsbSerialDriver.java \ diff --git a/custom-example/android/AndroidManifest.xml b/custom-example/android/AndroidManifest.xml new file mode 100644 index 000000000..e6a349cb5 --- /dev/null +++ b/custom-example/android/AndroidManifest.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/custom-example/android/res/drawable-ldpi/icon.png b/custom-example/android/res/drawable-ldpi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..8676e6502c749cf0015a93c47c76c42d43b251ae GIT binary patch literal 20526 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