diff options
| author | Heikki Halmet <heikki.halmet@qt.io> | 2019-04-05 13:43:07 +0300 |
|---|---|---|
| committer | Tony Sarajärvi <tony.sarajarvi@qt.io> | 2019-06-10 10:14:57 +0300 |
| commit | a2b1dd2d0afe58f27b1585ecab5235ae32932ef8 (patch) | |
| tree | de6d2e2e1f9d98275249d347feeb1bcc0308b01c /coin | |
| parent | 608788de2d10c55b0b3d7c11776f368da015a89a (diff) | |
| download | qt5-a2b1dd2d0afe58f27b1585ecab5235ae32932ef8.tar.gz | |
Provisioning: Use ANDROID_NDK_ROOT instead of ANDROID_NDK_HOME
Without this binaries will be hardcoded to look in e.g
/opt/android/android-ndk-r19b which means that RTA tests will fail
Task-number: QTBUG-74952
Change-Id: Ic2b1297e15d905f2250333b6bc884abe2f1472d4
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit dbaa42baa77309a1aa407cd45078d885f7428aa2)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Diffstat (limited to 'coin')
| -rwxr-xr-x | coin/provisioning/common/linux/android_linux.sh | 1 | ||||
| -rwxr-xr-x | coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index a15bcf03..5840d4b4 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -95,6 +95,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" 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 d0acdd45..544364b0 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 @@ -76,6 +76,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" "darwin-x86_64" SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel" |