diff options
author | BogDan Vatra <bogdan@kde.org> | 2019-06-06 15:02:30 +0300 |
---|---|---|
committer | BogDan Vatra <bogdan@kde.org> | 2019-06-06 15:31:29 +0300 |
commit | 9dec965248503836ad478b1c1ffdd7f34aed048b (patch) | |
tree | c1d1b398e817640259cf559938f782bf00084bd9 /mkspecs/features/android | |
parent | 0ad4da0c64fc28e26f31eb232aa768af966040ac (diff) |
Say hello to $ make apk
Now creating an .apk it's easier than ever.
"$ make apk" is all you need to run to create an apk for your application.
[ChangeLog][Android] Introduce "make apk" target, an easy way to create an apk.
Change-Id: I12565e7ed32beb42da40d8ce42a52339038be950
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'mkspecs/features/android')
-rw-r--r-- | mkspecs/features/android/android.prf | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/mkspecs/features/android/android.prf b/mkspecs/features/android/android.prf index 1dc8f87313..0e6f4a4592 100644 --- a/mkspecs/features/android/android.prf +++ b/mkspecs/features/android/android.prf @@ -1,3 +1,21 @@ +APK_PATH = $$shell_path($$OUT_PWD/android-build/$${TARGET}.apk) +!contains(TEMPLATE, subdirs): { + apk_install_target.target = apk_install_target + apk_install_target.depends = first + apk_install_target.commands = $(MAKE) -f $(MAKEFILE) INSTALL_ROOT=$$OUT_PWD/android-build install + + apk.target = apk + apk.depends = apk_install_target + qtPrepareTool(ANDROIDDEPLOYQT, androiddeployqt) + isEmpty(ANDROID_DEPLOYMENT_SETTINGS_FILE): ANDROID_DEPLOYMENT_SETTINGS_FILE = $$OUT_PWD/android-$$TARGET-deployment-settings.json + contains(QMAKE_HOST.os, Windows): extension = .exe + apk.commands = $$ANDROIDDEPLOYQT --input $$ANDROID_DEPLOYMENT_SETTINGS_FILE --output $$OUT_PWD/android-build --apk $$APK_PATH +} else { + prepareRecursiveTarget(apk) + prepareRecursiveTarget(apk_install_target) +} +QMAKE_EXTRA_TARGETS *= apk apk_install_target + contains(TEMPLATE, ".*app") { !android_app { !contains(TARGET, ".so"): TARGET = lib$${TARGET}.so |