Skip to content

Port: Android build fixes #2470

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.

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

Merged
merged 1 commit into from
Aug 14, 2019
Merged

Port: Android build fixes #2470

merged 1 commit into from
Aug 14, 2019

Conversation

millenomi
Copy link
Contributor

Fixes issues seen in https://dev.azure.com/compnerd/windows-swift/_build/results?buildId=6297&view=logs&j=1d59321a-8fbc-5405-c03e-4696bd0a260e&t=1075a828-3280-5930-19a8-eb2ba31fb39b&l=805:

  • INADDR_ANY is not necessarily available on Android.
  • Cast INADDR_* values to in_addr_t before assignment.
  • Android imports SOCK_* as untyped Int32 values; do not invoke .rawValue on them in that case.

Fixes issues seen in https://dev.azure.com/compnerd/windows-swift/_build/results?buildId=6297&view=logs&j=1d59321a-8fbc-5405-c03e-4696bd0a260e&t=1075a828-3280-5930-19a8-eb2ba31fb39b&l=805:

 - INADDR_ANY is not necessarily available on Android.
 - Cast INADDR_* values to in_addr_t before assignment.
 - Android imports SOCK_* as untyped Int32 values; do not invoke .rawValue on them in that case.
@millenomi
Copy link
Contributor Author

cc @compnerd @gmittert

@millenomi
Copy link
Contributor Author

@swift-ci please test

@compnerd
Copy link
Member

@compnerd
Copy link
Member

Repairs the build for android ARM, ARM64, and x64!

@millenomi millenomi merged commit f2d055c into swiftlang:master Aug 14, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants