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

Provisioning: Use ANDROID_NDK_ROOT instead of ANDROID_NDK_HOME

Browse Source 
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 dbaa42baa7)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
This commit is contained in:
Heikki Halmet
2019-04-05 13:43:07 +03:00
committed by Tony Sarajärvi
parent 608788de2d
commit a2b1dd2d0a
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
coin/provisioning/common/linux/android_linux.sh
View File

@@ -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"

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

@@ -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"