diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-05-03 10:10:23 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-05-03 10:10:23 +0200 |
| commit | ff8220f9f67ce7aa166a083d50d937578ab6a9db (patch) | |
| tree | 320f7b362b0f59c382546fc98172cc61c811ce95 /coin/provisioning/common/windows/android-openssl.ps1 | |
| parent | 38b6cbfd4261433548674aa4d109fff8a007c636 (diff) | |
| parent | 577d01e9dfaa9e69608097c550bd1877b5a9b735 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
.gitmodules
coin/platform_configs/default.txt
coin/platform_configs/qt5.txt
coin/platform_configs/qtbase.txt
Change-Id: Ib25154566eb6da77f091d8f112cc1248cac9eb16
Diffstat (limited to 'coin/provisioning/common/windows/android-openssl.ps1')
| -rw-r--r-- | coin/provisioning/common/windows/android-openssl.ps1 | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1 index db53bcc9..cf144c90 100644 --- a/coin/provisioning/common/windows/android-openssl.ps1 +++ b/coin/provisioning/common/windows/android-openssl.ps1 @@ -53,10 +53,6 @@ Rename-Item C:\Utils\openssl-$version $destination Remove-Item -Path $zip Remove-Item C:\Utils\openssl-$version.tar -# Set-EnvironmentVariable "CC" "C:\utils\Android\android-ndk-r18b\toolchains\llvm\prebuilt\windows\bin\clang" -# Set-EnvironmentVariable "ANDROID_AR" "C:\utils\Android\android-ndk-r18b\toolchains\llvm\prebuilt\windows\bin\llvm-ar" -# Set-EnvironmentVariable "ANDROID_DEV" "C:\utils\Android\android-ndk-r18b\platforms\android-21\arch-arm\usr" - # Make sure configure for openssl has a "make" and "perl" available $env:PATH = $env:PATH + ";C:\msys\1.0\bin;C:\strawberry\perl\bin" |