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

Update Android NDK version and API version #629

Merged
merged 7 commits into from
Apr 7, 2022
Merged

Update Android NDK version and API version #629

merged 7 commits into from
Apr 7, 2022

Conversation

dalance
Copy link
Contributor

@dalance dalance commented Jan 19, 2022

This PR updates Android NDK version and API version as the same as libc crate.

https://github.com/rust-lang/libc/blob/master/ci/android-install-ndk.sh

Fix #195

@dalance dalance requested review from Dylan-DPC-zz and a team as code owners January 19, 2022 02:59
@dalance dalance mentioned this pull request Jan 19, 2022
Closed
@dalance dalance force-pushed the update_android_ndk branch from 8f05201 to 46010b4 Compare January 19, 2022 03:34
burrbull
burrbull previously approved these changes Jan 19, 2022
View reviewed changes
@dalance dalance mentioned this pull request Jan 19, 2022
Open
@dalance dalance marked this pull request as draft January 19, 2022 09:14
@dalance dalance force-pushed the update_android_ndk branch from 46010b4 to 607a7f9 Compare January 24, 2022 07:04
@dalance dalance marked this pull request as ready for review January 24, 2022 07:06
@dalance dalance force-pushed the update_android_ndk branch from 607a7f9 to 1c96e3f Compare January 24, 2022 07:06
@dalance
Copy link
Contributor Author

dalance commented Jan 24, 2022

I've updated android-system.sh to update bionic versiion to Andriod 9.0.0.
Docker build was success at my local environment.

@dalance
Copy link
Contributor Author

dalance commented Mar 14, 2022

bors try

@bors
Copy link
Contributor

bors bot commented Mar 14, 2022

🔒 Permission denied

Existing reviewers: click here to make dalance a reviewer

@dalance
Copy link
Contributor Author

dalance commented Mar 14, 2022

@burrbull Could you retry test?

@svenstaro
Copy link
Contributor

bors try

bors bot added a commit that referenced this pull request Mar 14, 2022
@bors
Try #629:
4910503
@bors
Copy link
Contributor

bors bot commented Mar 14, 2022

try

Build failed:

@dalance dalance mentioned this pull request Mar 14, 2022
Open
@dalance dalance force-pushed the update_android_ndk branch from 1c96e3f to 17ca1e3 Compare March 14, 2022 05:37
@dalance dalance requested a review from a team as a code owner March 14, 2022 05:37
@Emilgardis
Copy link
Member

bors try

bors bot added a commit that referenced this pull request Mar 14, 2022
@bors
Try #629:
dab4674
@bors
Copy link
Contributor

bors bot commented Mar 14, 2022

try

Build failed:

@dalance
Copy link
Contributor Author

dalance commented Mar 31, 2022

Could you retry test?

reitermarkus
reitermarkus reviewed Mar 31, 2022
View reviewed changes
ci/test.sh Outdated Show resolved Hide resolved
@reitermarkus
Copy link
Member

bors try

bors bot added a commit that referenced this pull request Mar 31, 2022
@bors
Try #629:
7dccf33
@reitermarkus reitermarkus mentioned this pull request Mar 31, 2022
Merged
reitermarkus
reitermarkus previously requested changes Mar 31, 2022
View reviewed changes
ci/test.sh Outdated Show resolved Hide resolved
ci/test.sh Outdated Show resolved Hide resolved
@bors
Copy link
Contributor

bors bot commented Mar 31, 2022

try

Build succeeded:

@dalance
Copy link
Contributor Author

dalance commented Mar 31, 2022

I think this PR is ready to merge. Could you review?

@Emilgardis
Copy link
Member

Please rebase the branch instead of using merge commit 👍

If you are unsure how, just ask!

@dalance dalance force-pushed the update_android_ndk branch 2 times, most recently from 7fef879 to 8fe20a3 Compare March 31, 2022 11:28
@dalance
Copy link
Contributor Author

dalance commented Mar 31, 2022

I removed merge commits.
How about it?

Emilgardis
Emilgardis requested changes Mar 31, 2022
View reviewed changes
src/docker.rs Outdated Show resolved Hide resolved
Emilgardis
Emilgardis approved these changes Mar 31, 2022
View reviewed changes
Copy link
Member

@Emilgardis Emilgardis left a comment

Choose a reason for hiding this comment

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

thanks!

bors r+

@bors
Copy link
Contributor

bors bot commented Mar 31, 2022

👎 Rejected by code reviews

@dalance
Copy link
Contributor Author

dalance commented Apr 7, 2022

@reitermarkus Could you check the change requests?

Emilgardis
Emilgardis previously approved these changes Apr 7, 2022
View reviewed changes
Copy link
Member

@Emilgardis Emilgardis left a comment

Choose a reason for hiding this comment

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

bors r+

@bors
Copy link
Contributor

bors bot commented Apr 7, 2022

Merge conflict.

@dalance dalance force-pushed the update_android_ndk branch from 63b9e8d to d88eb5e Compare April 7, 2022 05:32
@dalance
Copy link
Contributor Author

dalance commented Apr 7, 2022

I resolved conflict.

Emilgardis
Emilgardis approved these changes Apr 7, 2022
View reviewed changes
Copy link
Member

@Emilgardis Emilgardis left a comment

Choose a reason for hiding this comment

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

bors r+

@bors
Copy link
Contributor

bors bot commented Apr 7, 2022

Build succeeded:

@bors bors bot merged commit 90bb9f1 into cross-rs:main Apr 7, 2022
@Emilgardis Emilgardis added this to the v0.2.2 milestone Jun 15, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Emilgardis Emilgardis Emilgardis approved these changes

@burrbull burrbull burrbull left review comments

@reitermarkus reitermarkus reitermarkus left review comments

@Dylan-DPC-zz Dylan-DPC-zz Awaiting requested review from Dylan-DPC-zz

Assignees
No one assigned
Labels
A-android Area: android targets container-images enhancement
Projects
None yet
Milestone
v0.2.2
Development

Successfully merging this pull request may close these issues.

Support same android ndk versions as rust-lang/rust and rust-lang/libc
6 participants
@dalance @svenstaro @Emilgardis @reitermarkus @burrbull @Alexhuszagh