aboutsummaryrefslogtreecommitdiffstats
path: root/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh
Commit message (Collapse)AuthorAgeFilesLines
* Fix Android provisioning scriptSimo Fält2017-12-221-1/+1
| | | | | | | | | | We have to accept extra license to enable installing all required packages. Task-number: QTQAINFRA-1660 Change-Id: I9d014991be96ff0723688b317a645e281b3e92d0 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit 5df4ec2ec999440ba291f2bf2f9fa6b72810660d)
* Fix spelling of ANDROID_SDK_HOMETony Sarajärvi2017-11-071-1/+1
| | | | | | | | It was incorrectly created at ANDROID_SDK_ROOT, but Coin doesn't use that env variable. It uses _HOME. Change-Id: I64b8befd4341e917c7aa28586ac8bf1dbf4e23a4 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Provisioning: fix .ci.local addresses to .intra.qt.ioTony Sarajärvi2017-11-031-1/+1
| | | | | Change-Id: I0ae934a65a2eaefa0bc4db9afbe3b8701dcb0906 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Fix typo in echoing version to versions.txtTony Sarajärvi2017-10-171-4/+4
| | | | | | Change-Id: I36f9f9181fcf60774766f122e6f5526f62c8c249 Reviewed-by: Joni Jäntti <joni.jantti@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.9Simon Hausmann2017-04-251-17/+5
| | | | | | | | | | Conflicts: coin/platform_configs/default.txt coin/platform_configs/qt5.txt coin/provisioning/qtci-osx-10.10-x86_64/android.sh coin/provisioning/qtci-osx-10.11-x86_64/android.sh Change-Id: I2c3ae694d05ffe502967595fc7c7cfc6ddae4d4d
* Provision Android SDK to macOS 10.12Tony Sarajärvi2017-04-201-0/+128
Task-number: QTQAINFRA-1094 Change-Id: Ibee4e78979cdaff447c8a9d75024994ebc121572 Reviewed-by: Jake Petroules <jake.petroules@qt.io>