lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-19 03:26:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update Android NDK and SDK on macOS envs

Browse Source 
Task-number: QTQAINFRA-2244
Change-Id: I20994bc7a64edefda09da68c4beddde4dc9948aa
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
This commit is contained in:
Tony Sarajärvi
2018-10-02 08:50:31 +03:00
committed by Liang Qi
parent bc5e5baf55
commit 4667cfc432
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh
View File

@@ -47,15 +47,15 @@ sdkTargetFolder="$targetFolder/sdk"
basePath="/net/ci-files01-hki.intra.qt.io/hdd/www/input/android" basePath="/net/ci-files01-hki.intra.qt.io/hdd/www/input/android"
toolsVersion="r25.2.5" toolsVersion="r26.1.1"
toolsFile="tools_$toolsVersion-macosx.zip" toolsFile="sdk-tools-darwin-4333796.zip"
ndkVersion="r16b" ndkVersion="r18b"
ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip" ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip"
sdkBuildToolsVersion="25.0.2" sdkBuildToolsVersion="28.0.3"
sdkApiLevel="android-21" sdkApiLevel="android-21"
toolsSha1="d2168d963ac5b616e3d3ddaf21511d084baf3659" toolsSha1="ed85ea7b59bc3483ce0af4c198523ba044e083ad"
ndkSha1="e51e615449b98c716cf912057e2682e75d55e2de" ndkSha1="98cb9909aa8c2dab32db188bbdc3ac6207e09440"
toolsTargetFile="/tmp/$toolsFile" toolsTargetFile="/tmp/$toolsFile"
toolsSourceFile="$basePath/$toolsFile" toolsSourceFile="$basePath/$toolsFile"
@@ -73,6 +73,9 @@ sudo chown -R qt:wheel "$targetFolder"
echo "Running SDK manager for platforms;$sdkApiLevel, tools, platform-tools and build-tools;$sdkBuildToolsVersion." echo "Running SDK manager for platforms;$sdkApiLevel, tools, platform-tools and build-tools;$sdkBuildToolsVersion."
(echo "y"; echo "y") |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" (echo "y"; echo "y") |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion"
echo "Checking the contents of Android SDK..."
ls -l "$sdkTargetFolder"
SetEnvVar "ANDROID_SDK_HOME" "$sdkTargetFolder" SetEnvVar "ANDROID_SDK_HOME" "$sdkTargetFolder"
SetEnvVar "ANDROID_NDK_HOME" "$targetFolder/android-ndk-$ndkVersion" SetEnvVar "ANDROID_NDK_HOME" "$targetFolder/android-ndk-$ndkVersion"
SetEnvVar "ANDROID_NDK_HOST" "darwin-x86_64" SetEnvVar "ANDROID_NDK_HOST" "darwin-x86_64"