summaryrefslogtreecommitdiffstats
path: root/coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2019-11-27 09:23:05 +0100
committerAlexandru Croitor <alexandru.croitor@qt.io>2019-11-28 19:44:30 +0100
commit63c515a6cbb002e96eea0134a77c380e5ef7b7c9 (patch)
tree2322b3189c4ae04e1ac0c7fc21354e1fd59a8749 /coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh
parent3ba8bdeda0fd23bec9de10cb4cf962b50a535af6 (diff)
parent0d6ae070f44236fdceda6241e9564dba93c91d0b (diff)
Merge remote-tracking branch 'origin/dev' into wip/cmake
Also update the Windows config to use MSVC2019 instead of 2017 to circumvent the issue that vcpkg is building libraries with the latest compiler it finds (MSVC 2019), but Qt is building with 2017. Conflicts: coin/platform_configs/default.yaml coin/platform_configs/qt5.yaml coin/platform_configs/qtsaferenderer.yaml Change-Id: I88deb114e171046b50fc617ab6bc18b707d61486
Diffstat (limited to 'coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh')
-rwxr-xr-xcoin/provisioning/qtci-macos-10.14-x86_64/30-android.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh
index 544364b0..1886cce3 100755
--- a/coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh
+++ b/coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh
@@ -51,7 +51,7 @@ toolsVersion="r26.1.1"
# toolsFile dertermines tools version
toolsFile="sdk-tools-darwin-4333796.zip"
-ndkVersion="r19c"
+ndkVersion="r20"
ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip"
sdkBuildToolsVersion="28.0.3"
# this is compile sdk version