diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-10-18 10:17:32 +0300 |
|---|---|---|
| committer | Andreas Buhr <andreas.buhr@qt.io> | 2021-10-22 09:14:29 +0200 |
| commit | d59825d250c0570f4c26da6908b471ccdd0faf01 (patch) | |
| tree | 1dbc3fffe8be1b905cd9a89e726aad885f6b24ae /coin/provisioning/qtci-macos-10.14-x86_64 | |
| parent | 6af22246cf3752f1d098a9e8a19617618edf65a2 (diff) | |
Coin:Android: set ANDROID_SDK_ROOT explicitly
... and remove ANDROID_{SDK,NDK}_HOME as they are
deprecated and might not work even.
Pick-to: 6.2
Task-number: QTBUG-97002
Change-Id: Ie6fe93eb91fad0153aee795b73a43e84e37c8127
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Diffstat (limited to 'coin/provisioning/qtci-macos-10.14-x86_64')
| -rwxr-xr-x | coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh | 3 |
1 files changed, 1 insertions, 2 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 283e2b08..f51931c6 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 @@ -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" |