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

[vcpkg] Improving android support #12634

Merged
merged 4 commits into from
Aug 7, 2020
Merged

[vcpkg] Improving android support #12634

merged 4 commits into from
Aug 7, 2020

Conversation

christophe-calmejane
Copy link
Contributor

Describe the pull request
Improving Android support:

  • Allow for custom triplet to be used by the android toolchain: Currently there is a strict name check (eg. arm64-android), which I replaced with a regex match so one can define arm64-android-custom triplet.
  • Improved android NDK autodetection algorithm by also checking Xamarin default installed folder
  • Fixed boost-modular-build-helper for Android: improved existing issue which only had a partial fix

Which triplets are supported/not supported? Have you updated the CI baseline?
Only affects android toolchain. No change to the CI.

Does your PR follow the maintainer guide?
It should.

@ghost
Copy link

ghost commented Jul 29, 2020 •
edited by ghost
Loading

CLA assistant check
All CLA requirements met.

@PhoebeHui PhoebeHui self-assigned this Jul 30, 2020
PhoebeHui
PhoebeHui reviewed Jul 31, 2020
View reviewed changes
Copy link
Contributor

@PhoebeHui PhoebeHui left a comment

Choose a reason for hiding this comment

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

@christophe-calmejane, thanks for the PR!

Could you update the 'Port-Version' to 3 in boost-modular-build-helper CONTROL file?

@PhoebeHui PhoebeHui changed the title Improving android support [vcpkg] Improving android support Jul 31, 2020
@PhoebeHui PhoebeHui added category:vcpkg-feature The issue is a new capability of the tool that doesn’t already exist and we haven’t committed requires:author-response labels Jul 31, 2020
@christophe-calmejane
Copy link
Contributor Author

Oh yes sure, forgot I pushed boost fix along with toolchain fix.

@PhoebeHui PhoebeHui added info:reviewed Pull Request changes follow basic guidelines and removed requires:author-response labels Aug 3, 2020
PhoebeHui
PhoebeHui approved these changes Aug 3, 2020
View reviewed changes
Copy link
Contributor

@PhoebeHui PhoebeHui left a comment

Choose a reason for hiding this comment

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

Thanks for your updates!

@PhoebeHui PhoebeHui added the category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist label Aug 3, 2020
strega-nil
strega-nil approved these changes Aug 5, 2020
View reviewed changes
Copy link
Contributor

@strega-nil strega-nil left a comment

Choose a reason for hiding this comment

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

I'd prefer to have the ^ at the front, just to make sure that we don't match [something]x64-android by accident.

scripts/toolchains/android.cmake Outdated Show resolved Hide resolved
scripts/toolchains/android.cmake Outdated Show resolved Hide resolved
scripts/toolchains/android.cmake Outdated Show resolved Hide resolved
scripts/toolchains/android.cmake Outdated Show resolved Hide resolved
@strega-nil
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@strega-nil strega-nil merged commit 60bb798 into microsoft:master Aug 7, 2020
@JackBoosY JackBoosY mentioned this pull request Feb 19, 2021
Closed
@christophe-calmejane christophe-calmejane mentioned this pull request Sep 9, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@strega-nil strega-nil strega-nil approved these changes

@PhoebeHui PhoebeHui PhoebeHui approved these changes

Assignees

@PhoebeHui PhoebeHui

Labels
category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist category:vcpkg-feature The issue is a new capability of the tool that doesn’t already exist and we haven’t committed info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@christophe-calmejane @strega-nil @PhoebeHui