aboutsummaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorRaphaël Cotty <raphael.cotty@gmail.com>2020-06-13 15:40:51 +0200
committerRaphaël Cotty <raphael.cotty@gmail.com>2020-06-25 15:55:43 +0000
commitc5111c5b04f3d7c5dca153e47f949f3119cb0434 (patch)
treef3d9fb08ccc24ca9e9694f03290413c130fb2e9d /.travis.yml
parent4de23ccb87bc93afefded644edd4285ee1d7a6dd (diff)
Android: Add support to generation of aab package
This patch adds the Android.sdk packageType property which sets the target application. By default (previous behavior) qbs generates an apk package. When set to aab, qbs generates instead an aab package Change-Id: Ic09776d08e2a2ecd68fb4c08881201a7a0a25240 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml11
1 files changed, 9 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index ef86db701..e5a73e9f2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -64,14 +64,21 @@ jobs:
- docker-compose run --rm bionic scripts/run-analyzer.sh
- <<: *build-on-bionic
- name: With Qbs and with Qt for Android
+ name: With Qbs and with Qt 5.13 for Android
before_install:
- docker-compose pull bionic
- docker-compose pull bionic-android-513
- - docker-compose pull bionic-android-514
script:
- docker-compose run bionic qbs build modules.cpp.compilerWrapper:ccache modules.qbsbuildconfig.enableBundledQt:true config:release
- docker-compose run bionic-android-513 scripts/test-qt-for-android.sh release/install-root/usr/local/bin
+
+ - <<: *build-on-bionic
+ name: With Qbs and with Qt 5.14 for Android
+ before_install:
+ - docker-compose pull bionic
+ - docker-compose pull bionic-android-514
+ script:
+ - docker-compose run bionic qbs build modules.cpp.compilerWrapper:ccache modules.qbsbuildconfig.enableBundledQt:true config:release
- docker-compose run bionic-android-514 scripts/test-qt-for-android.sh release/install-root/usr/local/bin
- &build-on-macos