aboutsummaryrefslogtreecommitdiffstats
path: root/coin/provisioning/common
diff options
context:
space:
mode:
authorHeikki Halmet <heikki.halmet@qt.io>2017-01-25 10:12:36 +0200
committerLiang Qi <liang.qi@qt.io>2017-01-28 03:57:41 +0000
commitd4681ee6906f441d072df6e060599e6d7741d5a4 (patch)
tree767585175609ca1a41d7ff8e3a53f3e271d7be25 /coin/provisioning/common
parent3276f075b9649489d0d61fe624e3e8efac6e30ea (diff)
Android sdk and ndk to provisioning for Windows 7
Installs latest Android sdk and ndk. It also runs update for SDK API level 18, latest SDK- and platform- tools and build-tools version 23.0.3. Task-number: QTBUG-58369 Change-Id: Ib42f5149243fc5d262f6542e26726d1c8cbb2e8c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'coin/provisioning/common')
-rw-r--r--coin/provisioning/common/01-windows_removethemall.ps15
-rw-r--r--coin/provisioning/common/memorypershell.ps13
2 files changed, 8 insertions, 0 deletions
diff --git a/coin/provisioning/common/01-windows_removethemall.ps1 b/coin/provisioning/common/01-windows_removethemall.ps1
index 8285ddae..9e64a34d 100644
--- a/coin/provisioning/common/01-windows_removethemall.ps1
+++ b/coin/provisioning/common/01-windows_removethemall.ps1
@@ -59,3 +59,8 @@ Function Remove-Path {
Remove C:\Python27
Remove-Path C:\python27\scripts
Remove-Path C:\python27
+
+# Remove Android sdk and ndk
+Remove C:\utils\android*
+[Environment]::SetEnvironmentVariable("ANDROID_NDK_HOME",$null,"User")
+[Environment]::SetEnvironmentVariable("ANDROID_SDK_HOME",$null,"User")
diff --git a/coin/provisioning/common/memorypershell.ps1 b/coin/provisioning/common/memorypershell.ps1
new file mode 100644
index 00000000..2a8ebb68
--- /dev/null
+++ b/coin/provisioning/common/memorypershell.ps1
@@ -0,0 +1,3 @@
+# This is needed e.g. for Android NDK installation for Windows 7 x86
+echo "Increase value of MaxMemoryPerShellMB to avoid 'out of memory' exception"
+set-item wsman:localhost\Shell\MaxMemoryPerShellMB 2048