diff --git a/android.pri b/android.pri index 4155947431d50af2c1f31bc919f6c92dae63a75d..b282d988ff30b9d3d1f2a3f391d3fd686f84d27e 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 0000000000000000000000000000000000000000..e6a349cb50e7a78fe857f2738e07c68ecc76f410 --- /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 Binary files /dev/null and b/custom-example/android/res/drawable-ldpi/icon.png differ diff --git a/custom-example/android/src/org/custom/qgroundcontrol/CustomQGCActivity.java b/custom-example/android/src/org/custom/qgroundcontrol/CustomQGCActivity.java new file mode 100644 index 0000000000000000000000000000000000000000..c224ea748140d8ac23b91038c7e110a7c2e827fe --- /dev/null +++ b/custom-example/android/src/org/custom/qgroundcontrol/CustomQGCActivity.java @@ -0,0 +1,5 @@ +package org.custom.qgroundcontrol; + +import org.mavlink.qgroundcontrol.QGCActivity; + +public class CustomQGCActivity extends QGCActivity {}