diff options
Diffstat (limited to 'coin/provisioning/common/windows')
| -rw-r--r-- | coin/provisioning/common/windows/android-openssl.ps1 | 4 | ||||
| -rw-r--r-- | coin/provisioning/common/windows/android.ps1 | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1 index dfe4a785..e895864b 100644 --- a/coin/provisioning/common/windows/android-openssl.ps1 +++ b/coin/provisioning/common/windows/android-openssl.ps1 @@ -87,10 +87,10 @@ if ((Test-Path $prebuilt_url)) { } } - $configure = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang $openssl_path/Configure shared android-arm`"") + $configure = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_ROOT=$ndkPath PATH=${cc_path}:`$PATH CC=clang $openssl_path/Configure shared android-arm`"") CheckExitCode $configure - $make = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang make -f $openssl_path/Makefile build_generated`"") + $make = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_ROOT=$ndkPath PATH=${cc_path}:`$PATH CC=clang make -f $openssl_path/Makefile build_generated`"") CheckExitCode $make Pop-Location diff --git a/coin/provisioning/common/windows/android.ps1 b/coin/provisioning/common/windows/android.ps1 index 82c7ee50..8ab06d82 100644 --- a/coin/provisioning/common/windows/android.ps1 +++ b/coin/provisioning/common/windows/android.ps1 @@ -73,13 +73,12 @@ function Install($1, $2, $3, $4) { Write-Host "Installing Android NDK $nkdVersion" Install $ndkCachedUrl $ndkZip $ndkChecksum $ndkOfficialUrl -Set-EnvironmentVariable "ANDROID_NDK_HOME" $ndkFolder Set-EnvironmentVariable "ANDROID_NDK_ROOT" $ndkFolder Install $toolsCachedUrl $sdkZip $toolsChecksum $sdkOfficialUrl New-Item -ItemType directory -Path $toolsFolder Move-Item -Path C:\Utils\Android\tools -Destination $toolsFolder\ -Set-EnvironmentVariable "ANDROID_SDK_HOME" "C:\Utils\Android" +Set-EnvironmentVariable "ANDROID_SDK_ROOT" "C:\Utils\Android" Set-EnvironmentVariable "ANDROID_API_VERSION" $sdkApiLevel if (IsProxyEnabled) { |