diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-04-13 11:38:39 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-04-13 11:38:39 +0200 |
| commit | 8710c7d9cf90ad7ab542451b3fb36bb97011a8aa (patch) | |
| tree | 0e60ea439dae4b823bc910fb85cef488754092e1 /coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh | |
| parent | 869c15629d8397bc725c61da423a4a038ef4d395 (diff) | |
| parent | f31970d5ac48cd2ae6601aca32738ea718edb265 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
coin/platform_configs/qt3d-runtime.txt
coin/platform_configs/qt5.txt
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh
coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh
Change-Id: Ie428600c72b7fe4d7b5fa7583e11aebd47cfb85e
Diffstat (limited to 'coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh')
| -rwxr-xr-x | coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh index 97df7e57..d0acdd45 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh @@ -57,12 +57,7 @@ sdkBuildToolsVersion="28.0.3" # this is compile sdk version sdkApiLevel="android-28" -toolsSha1="ed85ea7b59bc3483ce0af4c198523ba044e083ad" -ndkSha1="f46b8193109bba8a58e0461c1a48f4534051fb25" - -toolsTargetFile="/tmp/$toolsFile" toolsSourceFile="$basePath/$toolsFile" -ndkTargetFile="/tmp/$ndkFile" ndkSourceFile="$basePath/$ndkFile" echo "Unzipping Android NDK to '$targetFolder'" |