diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-09-12 12:18:46 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-09-17 08:02:50 +0200 |
| commit | c22758cc1ee89e93330eaa14fff4deff6b7edba8 (patch) | |
| tree | 362fd4cb43cedbfe0f34a15b2d711b6d02b15ae2 /coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh | |
| parent | 6762ccb18664aee9e50b05a9d49042477405b9bb (diff) | |
| parent | 01ad208333f7467e906dfaf0b56be50cb6945f95 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"
Diffstat (limited to 'coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh')
| -rwxr-xr-x | coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh | 3 |
1 files changed, 2 insertions, 1 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 c0d75ff6..544364b0 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 @@ -51,7 +51,7 @@ toolsVersion="r26.1.1" # toolsFile dertermines tools version toolsFile="sdk-tools-darwin-4333796.zip" -ndkVersion="r18b" +ndkVersion="r19c" ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip" sdkBuildToolsVersion="28.0.3" # this is compile sdk version @@ -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" |