diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-12-10 16:40:18 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-12-14 10:48:59 +0000 |
| commit | fecfd6f771637e1d919daff79367056f3bdd09b8 (patch) | |
| tree | 9e6a23aa63b0b620d3535500307dea300d7fcfd7 | |
| parent | 1f2aef79bff353e1414a7213baad3c3baf94b6ee (diff) | |
Coin:Android: set ANDROID_SDK_ROOT explicitly in macOS 12 config
... and remove ANDROID_{SDK,NDK}_HOME as they are
deprecated and might not work even.
Amends 7e2882d0a7a53ecf4b234a53bf891dfed2291cbe
Augments d59825d250c0570f4c26da6908b471ccdd0faf01
Task-number: QTBUG-97002
Change-Id: I96fb543521d70784d75e524d8b48ac72c42e6815
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 6e7de2b76c4db94504b9efe9088c455809d01208)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rwxr-xr-x | coin/provisioning/qtci-macos-12-x86_64/30-android.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/coin/provisioning/qtci-macos-12-x86_64/30-android.sh b/coin/provisioning/qtci-macos-12-x86_64/30-android.sh index e11494c4..6adabfd5 100755 --- a/coin/provisioning/qtci-macos-12-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-12-x86_64/30-android.sh @@ -82,8 +82,7 @@ echo "Running SDK manager for platforms;$sdkApiLevel, platform-tools and build-t echo "Checking the contents of Android SDK..." ls -l "$sdkTargetFolder" -SetEnvVar "ANDROID_SDK_HOME" "$sdkTargetFolder" -SetEnvVar "ANDROID_NDK_HOME" "$targetFolder/android-ndk-$ndkVersion" +SetEnvVar "ANDROID_SDK_ROOT" "$sdkTargetFolder" SetEnvVar "ANDROID_NDK_ROOT" "$targetFolder/android-ndk-$ndkVersion" SetEnvVar "ANDROID_NDK_HOST" "darwin-x86_64" SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel" |