dotfiles: add Android Studio, and a per-user Android SDK

[dotfiles] / setup-windows-steps.ps1

diff --git a/setup-windows-steps.ps1 b/setup-windows-steps.ps1
index 02c1515f502af33d06deb8d9e5a387e8261a95ef..4ff5786224f015d303c721417d3e5c99a8d29de4 100644 (file)
--- a/setup-windows-steps.ps1
+++ b/setup-windows-steps.ps1
@@ -122,6 +122,8 @@ function Get-SetupCatalog {
         New-SetupStep CMake               M bat -Admin -Package Kitware.CMake -Text 'standalone, so a plain cmake works in any shell'
         New-SetupStep AndroidGPUInspector M bat -Admin -Package Google.AndroidGPUInspector `
             -X64Only 'x64-only build, and it profiles Android devices, not this box'
         New-SetupStep CMake               M bat -Admin -Package Kitware.CMake -Text 'standalone, so a plain cmake works in any shell'
         New-SetupStep AndroidGPUInspector M bat -Admin -Package Google.AndroidGPUInspector `
             -X64Only 'x64-only build, and it profiles Android devices, not this box'

+        New-SetupStep AndroidStudio       M bat -Admin -Package Google.AndroidStudio -Text 'only if missing; it updates itself' `
+            -X64Only 'Google publishes no Windows ARM64 build of Android Studio'

         New-SetupStep OpenCppCoverage     M bat -Admin -Package OpenCppCoverage.OpenCppCoverage -Text 'native line coverage' `
             -X64Only 'it steps x86/x64 instructions, so it cannot cover an ARM64 binary'
         New-SetupStep WiX                 M bat -Needs DotNetSdk `
         New-SetupStep OpenCppCoverage     M bat -Admin -Package OpenCppCoverage.OpenCppCoverage -Text 'native line coverage' `
             -X64Only 'it steps x86/x64 instructions, so it cannot cover an ARM64 binary'
         New-SetupStep WiX                 M bat -Needs DotNetSdk `


@@ -153,6 +155,9 @@ function Get-SetupCatalog {
         New-SetupStep LlvmPath            C user -Needs LLVM -Text 'upstream LLVM on the user PATH' `
             -X64Only 'LLVM is not installed on ARM64'
         New-SetupStep RustToolchain       C user -Needs Rustup, VisualStudio -Text $rust
         New-SetupStep LlvmPath            C user -Needs LLVM -Text 'upstream LLVM on the user PATH' `
             -X64Only 'LLVM is not installed on ARM64'
         New-SetupStep RustToolchain       C user -Needs Rustup, VisualStudio -Text $rust

+        New-SetupStep AndroidSdk          C user -Needs AndroidStudio `
+            -Text 'Android SDK, per-user: latest platform + build-tools; accepts the SDK licences' `
+            -X64Only 'its Windows build tools are x86/x64 only, as is Android Studio'

         New-SetupStep ArchAudit           C user -Text 'architecture audit: native or emulated, for every tool (read-only)'
 
         # --- setup-windows.bat, after both halves ---
         New-SetupStep ArchAudit           C user -Text 'architecture audit: native or emulated, for every tool (read-only)'
 
         # --- setup-windows.bat, after both halves ---