Package and bundle Android SDKs into the windows toolchain installer #297
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
compnerd
reviewed
May 22, 2024
tristanlabelle
approved these changes
May 25, 2024
| @@ -38,6 +38,10 @@ | |||
| <Variable Name="OptionsInstallRedistAMD64" bal:Overridable="yes" Persisted="yes" Value="1" /> | |||
| <Variable Name="OptionsInstallSdkArm64" bal:Overridable="yes" Persisted="yes" Value="1" /> | |||
| <Variable Name="OptionsInstallRedistArm64" bal:Overridable="yes" Persisted="yes" Value="1" /> | |||
| <Variable Name="OptionsInstallAndroidSdkArm64" bal:Overridable="yes" Persisted="yes" Value="1" /> | |||
There was a problem hiding this comment.
Is the default value specified here? I think the Android SDK should be opt-in.
There was a problem hiding this comment.
Let's make arm64 and x86_64 on by default, but not the others ?
lxbndr
added a commit
to readdle/swift-installer-scripts
that referenced
this pull request
May 25, 2024
lxbndr
reviewed
May 25, 2024
hyp
pushed a commit
that referenced
this pull request
May 28, 2024
|
tested in swiftlang/swift#74220 |
|
@compnerd could you take another look? |
compnerd
approved these changes
Jun 7, 2024
Comment on lines
11
to
14
| INCLUDE_ARM64_ANDROID_SDK=$(INCLUDE_ARM64_ANDROID_SDK); | ||
| INCLUDE_x86_64_ANDROID_SDK=$(INCLUDE_x86_64_ANDROID_SDK); | ||
| INCLUDE_ARM_ANDROID_SDK=$(INCLUDE_ARM_ANDROID_SDK); | ||
| INCLUDE_X86_ANDROID_SDK=$(INCLUDE_X86_ANDROID_SDK); |
There was a problem hiding this comment.
It would be nicer to swap this around to ANDROID_... IMO
compnerd
pushed a commit
that referenced
this pull request
Jun 10, 2024
hyp
added a commit
that referenced
this pull request
Nov 18, 2024
Package and bundle Android SDKs into the windows toolchain installer (cherry picked from commit 0ecdc1c)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This change packages the Android SDKs that can be built using build.ps1 on windows into MSIs, which are then added to the toolchain's installer.
At the moment it covers aarch64 only, I'm adding and testing other arches and will update the PR with them as well.
For future follow-up: