diff options
| author | Heikki Halmet <heikki.halmet@qt.io> | 2018-10-25 09:05:55 +0300 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-10-31 15:47:01 +0000 |
| commit | 1f072766923b3fdbc9befa03b7b11ee9c6e071df (patch) | |
| tree | 97d181ac47a450a1bd2e72e01fbd1c4445d1b61f /coin | |
| parent | ea76ace8257d98a8c6d72fca39b1f7f559f084cb (diff) | |
Provisioning: Remove environment variables from androind-openssl
We shouldn't need those anymore.
Task-number: QTQAINFRA-1266
Change-Id: Ie2161eb1d05cc1af26cbbb1a46525a9a8d7c3a30
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/provisioning/common/windows/android-openssl.ps1 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1 index bac88de6..3a1ed26d 100644 --- a/coin/provisioning/common/windows/android-openssl.ps1 +++ b/coin/provisioning/common/windows/android-openssl.ps1 @@ -53,9 +53,9 @@ 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 "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" +# Set-EnvironmentVariable "CC" "C:\utils\Android\android-ndk-r18b\toolchains\llvm\prebuilt\windows\bin\clang" +# Set-EnvironmentVariable "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" |