diff options
Diffstat (limited to 'coin/provisioning/common/linux/android_linux.sh')
-rwxr-xr-x | coin/provisioning/common/linux/android_linux.sh | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index c77af943..b83c1c6e 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -51,13 +51,13 @@ basePath="http://ci-files01-hki.intra.qt.io/input/android" toolsVersion="r26.1.1" toolsFile="sdk-tools-linux-4333796.zip" -ndkVersion="r18b" +ndkVersion="r19c" ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip" sdkBuildToolsVersion="28.0.3" sdkApiLevel="android-28" toolsSha1="8c7c28554a32318461802c1291d76fccfafde054" -ndkSha1="500679655da3a86aecf67007e8ab230ea9b4dd7b" +ndkSha1="fd94d0be6017c6acbd193eb95e09cf4b6f61b834" toolsTargetFile="/tmp/$toolsFile" toolsSourceFile="$basePath/$toolsFile" @@ -80,14 +80,22 @@ else sudo chown -R qt:users "$targetFolder" fi +# Run the following command under `eval` or `sh -c` so that the shell properly splits it +sdkmanager_no_progress_bar_cmd="tr '\r' '\n' | grep -v '^\[[ =]*\]'" + echo "Running SDK manager for platforms;$sdkApiLevel, platform-tools and build-tools;$sdkBuildToolsVersion." # shellcheck disable=SC2031 if [ "$http_proxy" != "" ]; then proxy_host=$(echo "$proxy" | cut -d'/' -f3 | cut -d':' -f1) proxy_port=$(echo "$proxy" | cut -d':' -f3) - echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" --no_https --proxy=http --proxy_host="$proxy_host" --proxy_port="$proxy_port" "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion" + echo "y" | "$sdkTargetFolder/tools/bin/sdkmanager" \ + --no_https --proxy=http --proxy_host="$proxy_host" --proxy_port="$proxy_port" \ + "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion" \ + | eval $sdkmanager_no_progress_bar_cmd else - echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion" + echo "y" | "$sdkTargetFolder/tools/bin/sdkmanager" \ + "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion" \ + | eval $sdkmanager_no_progress_bar_cmd fi echo "Checking the contents of Android SDK..." @@ -95,6 +103,7 @@ ls -l "$sdkTargetFolder" SetEnvVar "ANDROID_SDK_HOME" "$sdkTargetFolder" SetEnvVar "ANDROID_NDK_HOME" "$targetFolder/android-ndk-$ndkVersion" +SetEnvVar "ANDROID_NDK_ROOT" "$targetFolder/android-ndk-$ndkVersion" SetEnvVar "ANDROID_NDK_HOST" "linux-x86_64" SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel" @@ -105,8 +114,11 @@ echo "Android SDK API level = $sdkApiLevel" >> ~/versions.txt echo "Android NDK = $ndkVersion" >> ~/versions.txt cd "$sdkTargetFolder/tools/bin" -./sdkmanager --install "emulator" -echo "y" | ./sdkmanager --install "system-images;android-21;google_apis;x86" +./sdkmanager --install "emulator" \ + | eval $sdkmanager_no_progress_bar_cmd +echo "y" | ./sdkmanager --install "system-images;android-21;google_apis;x86" \ + | eval $sdkmanager_no_progress_bar_cmd + echo "Checking the contents of Android SDK again..." ls -l "$sdkTargetFolder" |