Skip to content
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

[android] include ds2 as part of the Android SDK #203

Closed
wants to merge 9 commits into from
Closed

[android] include ds2 as part of the Android SDK #203

wants to merge 9 commits into from

Conversation

andrurogerz
Copy link
Collaborator

@andrurogerz andrurogerz commented Aug 12, 2024 •
edited
Loading

Builds all 4 Android variants of compnerd/ds2 to be included in the Android SDK.

NOTE: ds2 is not yet referenced by swift/swift-installer-scripts, so this change does not have any effect other than validating the build.

Test Plan

Manually inspected artifacts produced by the Android ds2 steps:

C:\Users\Andrew\Downloads>unzip -l ds2-Android-arm64.zip
Archive:  ds2-Android-arm64.zip
  Length     EAs   ACLs    Date   Time    Name
 --------    ---   ----    ----   ----    ----
 11907472      0      0  08/24/24 17:31   bin/ds2
 --------  -----  -----                   -------
 11907472      0      0                   1 file

C:\Users\Andrew\Downloads>unzip -l ds2-Android-armv7.zip
Archive:  ds2-Android-armv7.zip
  Length     EAs   ACLs    Date   Time    Name
 --------    ---   ----    ----   ----    ----
 10356780      0      0  08/26/24 15:19   bin/ds2
 --------  -----  -----                   -------
 10356780      0      0                   1 file

C:\Users\Andrew\Downloads>unzip -l ds2-Android-i686.zip
Archive:  ds2-Android-i686.zip
  Length     EAs   ACLs    Date   Time    Name
 --------    ---   ----    ----   ----    ----
 10048944      0      0  08/26/24 15:19   bin/ds2
 --------  -----  -----                   -------
 10048944      0      0                   1 file

C:\Users\Andrew\Downloads>unzip -l ds2-Android-x86_64.zip
Archive:  ds2-Android-x86_64.zip
  Length     EAs   ACLs    Date   Time    Name
 --------    ---   ----    ----   ----    ----
 11268640      0      0  08/26/24 15:21   bin/ds2
 --------  -----  -----                   -------
 11268640      0      0                   1 file

@andrurogerz andrurogerz force-pushed the andrurogerz/ds2 branch 13 times, most recently from 3fbc6b2 to 4deafe1 Compare August 19, 2024 20:53
@andrurogerz andrurogerz force-pushed the andrurogerz/ds2 branch 8 times, most recently from 291178b to 6bea8b9 Compare August 26, 2024 15:08
@andrurogerz andrurogerz changed the title [android] include ds2 as part of the Android sdk [android] include ds2 as part of the Android SDK Aug 27, 2024
@andrurogerz andrurogerz marked this pull request as ready for review August 27, 2024 00:28
@andrurogerz andrurogerz self-assigned this Aug 27, 2024
@andrurogerz andrurogerz requested review from hyp and Steelskin August 27, 2024 15:47
Steelskin
Steelskin approved these changes Aug 27, 2024
View reviewed changes
Steelskin
Steelskin approved these changes Aug 27, 2024
View reviewed changes
Copy link
Contributor

@Steelskin Steelskin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hold on, I just noticed the repo. This should probably be a compnerd PR.

@Steelskin Steelskin self-requested a review August 27, 2024 16:20
@andrurogerz
Copy link
Collaborator Author

Hold on, I just noticed the repo. This should probably be a compnerd PR.

@Steelskin Thanks for taking a look! Do you mean it should be reviewed by compnerd or should go to compnerd/swift-build?

@Steelskin
Copy link
Contributor

Hold on, I just noticed the repo. This should probably be a compnerd PR.

@Steelskin Thanks for taking a look! Do you mean it should be reviewed by compnerd or should go to compnerd/swift-build?

It should go in the compnerd/swift-build repo. We'll merge it after.

@andrurogerz andrurogerz force-pushed the andrurogerz/ds2 branch 3 times, most recently from 9476438 to 7b04afd Compare August 27, 2024 19:26
@andrurogerz
Copy link
Collaborator Author

It should go in the compnerd/swift-build repo. We'll merge it after.

@Steelskin I forked compnerd/swift-build and these changes cherry-picked cleanly. New PR with the same content is at compnerd/swift-build#820. Thanks!

@andrurogerz andrurogerz marked this pull request as draft August 27, 2024 22:04
@andrurogerz
[ds2] add ds2_version to swift-build context
ae04574
@andrurogerz
[ds2] add ds2_tools step to build RegsGen2 exe
e256e4f
@andrurogerz
[ds2] add ds2 step to build ds2 for all 4 Android flavors
4240d8e
@andrurogerz
[ds2] consume ds2 binaries as part of SDK
c21ba8d
@andrurogerz
[android] install Chocolatey if not installed
ba5a0cd 
Installs the Chocolatey package manager if it is not already installed
on the system. This is currently needed for the Azure runners but not
for GitHub runners, where Chocolatey is pre-installed.
@andrurogerz
[android] move NDK version to workflow input
c85e56a 
There are several jobs in the swift-toolchain workflow that build
against the Android NDK, and they all specify the same r26b version.

This change extracts the NDK version to workflow input so that it needs
only be specified in one place.
@andrurogerz
[android] make new jobs exclusive to Windows builders
b4a320f
@andrurogerz
include new inputs in the mac build
6015991 
ANDROID_NDK_VERSION and ds2_revision are required in all of the builds.
@andrurogerz andrurogerz closed this Sep 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Steelskin Steelskin Steelskin approved these changes

Assignees

@andrurogerz andrurogerz

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

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