From 6d2929d1aaa97454619725211eee4ff65c54b95e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Fri, 18 Aug 2017 12:32:37 +0300 Subject: Provisioning: Move Android toolchain and config to win10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Installing Android toolchains and ssl headers to win10 template and moving Android windows platform configs to win10 from win7. Task-number: QTQAINFRA-1266 Change-Id: I9b3e3a378451e0bdfc7dc5c7b75ee035faf8994c Reviewed-by: Tony Sarajärvi (cherry picked from commit 5a040ca46a46a3a45fa61036ca5115c4d0819034) --- coin/provisioning/common/windows/android-openssl.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin/provisioning/common/windows/android-openssl.ps1') diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1 index 5390dfae..4fe5e5ee 100644 --- a/coin/provisioning/common/windows/android-openssl.ps1 +++ b/coin/provisioning/common/windows/android-openssl.ps1 @@ -54,7 +54,7 @@ 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_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 -- cgit v1.2.3