Skip to content

[android] optionally include DS2 in Android SDK #335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 2 commits into from
Sep 4, 2024
Merged

[android] optionally include DS2 in Android SDK #335

merged 2 commits into from
Sep 4, 2024

Conversation

andrurogerz
Copy link
Contributor

@andrurogerz andrurogerz commented Aug 27, 2024 •
edited
Loading

Conditionally include DS2 in the Android SDK when building the MSI with -p:ANDROID_INCLUDE_DS2=true passed to msbuild. Has no impact on the generated installer if this property is not set.

Related to the build.ps1 changes in swiftlang/swift#76113

Validation

Verified by manually invoking msbuild against locally built swift toolchain (with local changes to build DS2) with and without -p:ANDROID_INCLUDE_DS2=true and manually inspected the output MSI file with MSI Viewer. Done for aarch64, x86_64, i686, and armv7.

MSBuild.exe -nologo -restore -maxCpuCount -p:BaseOutputPath=S:\b\installer\ -p:Configuration=Release -p:SignOutput=false -p:PLATFORM_ROOT="S:\b\arm64\Android.platform" -p:SDK_ROOT="S:\b\arm64\Android.platform\Developer\SDKs\Android.sdk" -p:ProductVersion=0.0.0 -p:ProductArchitecture=aarch64 -p:ANDROID_INCLUDE_DS2=true "S:\SourceCache\swift-installer-scripts\platforms\Windows\android_sdk\android_sdk.wixproj"
MSBuild.exe -nologo -restore -maxCpuCount -p:BaseOutputPath=S:\b\installer\ -p:Configuration=Release -p:SignOutput=false -p:PLATFORM_ROOT="S:\b\x64\Android.platform" -p:SDK_ROOT="S:\b\x64\Android.platform\Developer\SDKs\Android.sdk" -p:ProductVersion=0.0.0 -p:ProductArchitecture=x86_64 -p:ANDROID_INCLUDE_DS2=true "S:\SourceCache\swift-installer-scripts\platforms\Windows\android_sdk\android_sdk.wixproj"
MSBuild.exe -nologo -restore -maxCpuCount -p:BaseOutputPath=S:\b\installer\ -p:Configuration=Release -p:SignOutput=false -p:PLATFORM_ROOT="S:\b\armv7\Android.platform" -p:SDK_ROOT="S:\b\armv7\Android.platform\Developer\SDKs\Android.sdk" -p:ProductVersion=0.0.0 -p:ProductArchitecture=armv7 -p:ANDROID_INCLUDE_DS2=true "S:\SourceCache\swift-installer-scripts\platforms\Windows\android_sdk\android_sdk.wixproj"
MSBuild.exe -nologo -restore -maxCpuCount -p:BaseOutputPath=S:\b\installer\ -p:Configuration=Release -p:SignOutput=false -p:PLATFORM_ROOT="S:\b\x86\Android.platform" -p:SDK_ROOT="S:\b\x86\Android.platform\Developer\SDKs\Android.sdk" -p:ProductVersion=0.0.0 -p:ProductArchitecture=i686 -p:ANDROID_INCLUDE_DS2=true "S:\SourceCache\swift-installer-scripts\platforms\Windows\android_sdk\android_sdk.wixproj"

@andrurogerz andrurogerz marked this pull request as ready for review August 28, 2024 16:50
@andrurogerz
[android] optionally include DS2 in Android SDK
fe305d9 
Conditionally include DS2 in the Android SDK when building the MSI with
`-p:ANDROID_INCLUDE_DS2=true` passed to `msbuild`. Has no impact on the
generated installer if this property is not set.
@compnerd compnerd mentioned this pull request Sep 4, 2024
Open
@compnerd
Copy link
Member

compnerd commented Sep 4, 2024

The last change only modified the location and is not enabled in Apple CI, so I'm going to merge this without re-running.

@compnerd compnerd merged commit c535265 into swiftlang:main Sep 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@compnerd compnerd compnerd approved these changes

@shahmishal shahmishal Awaiting requested review from shahmishal shahmishal is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@andrurogerz @compnerd