Add misc constants and functions for android

[fkm3]

These are the main diffs present in the downstream android opensource
project repo.

[rust-highfive]

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @Amanieu (or someone else) soon.

Please see the contribution instructions for more information.

[Amanieu]

@bors r+

[Amanieu]

@bors r+

[bors]

📌 Commit 50bdc64 has been approved by Amanieu

[bors]

⌛ Testing commit 50bdc64 with merge 44557c4...

[bors]

💔 Test failed - checks-actions

[Amanieu]

CI failure seems to be because we are using an old version of the Android emulator. You should try updating the CI scripts to use a newer version.

[fkm3]

Thanks. It looks like it is using android SDK version 24 for arm and version 28 for x86, but getrandom was only added in version 28. I'll try bumping the version. eb0794a seems to have chosen different versions on purpose though, so I'm a little wary.

[Amanieu]

This seems to have been due to an unavailability of emulator images for certain SDK versions: #1344 (comment)

[Amanieu]

@bors r+

[bors]

📌 Commit 483df98 has been approved by Amanieu

[bors]

⌛ Testing commit 483df98 with merge f131632...

[bors]

💔 Test failed - checks-actions

[fkm3]

There are no system images for armeabi-v7a after API version 24. It may be that support was dropped. I'm unsure.

I'm going to try moving the getrandom declaration into b64/mod.rs and then only bump the API version for aarch64.

[Amanieu]

Maybe try using an arm64 image? It should support both 32-bit and 64-bit ARM.

[fkm3]

Good point. I've made that change. I can't get the tests to run locally on my machine, but I did verify the docker image could be built at least.

[Amanieu]

@bors r+

[bors]

💥 Test timed out

[fkm3]

Switched from dd to fallocate (12.892 secs vs 0.438 on my machine). Hopefully that will fix the time out.

[Amanieu]

@bors r+

[bors]

📌 Commit 8a64a22 has been approved by Amanieu

[bors]

⌛ Testing commit 8a64a22 with merge 05af8b7...

[bors]

💥 Test timed out

[Amanieu]

@bors retry

[bors]

⌛ Testing commit 8a64a22 with merge 2029969...

[bors]

💥 Test timed out

[Amanieu]

I think there might be something wrong with the arm image being used?

[fkm3]

Are there logs for the timeout?

[Amanieu]

https://github.com/rust-lang/libc/runs/6141722587?check_suite_focus=true

[fkm3]

Thanks. I can't find a solution. It seems like an over constrained problem.

Some notes, possibly incorrect:

• getrandom requires API version >= 28
• Android emulator support for arm64 on a x64 host was dropped somewhere in the API range (24, 28].
• There is some support for running arm on the x64 emulator (link), but I'm not sure if it is relevant to the CI tests. Additionally, running the x64 emulator on x64 requires KVM (which I assume the CI doesn't support, if it runs on github actions)

I wonder if we can avoid the android emulator altogether with some combination of qemu + the arm64 system image (similar to what the android x64 tests are doing). I might give that a try, but will probably be slow to follow up.

[Amanieu]

An alternative solution might be to simply exclude the new symbols from tests (see libc-test/build.rs) and keep using the old Android emulator image.

[bors]

☔ The latest upstream changes (presumably #2808) made this pull request unmergeable. Please resolve the merge conflicts.

[fkm3]

Sorry for the slow follow up.

An alternative solution might be to simply exclude the new symbols from tests (see libc-test/build.rs) and keep using the old Android emulator image.

I've uploaded new changes that try this approach.

I've also added another io_uring constant.

Thanks!

[JohnTitor]

@bors r+

[bors]

📌 Commit 572e11b has been approved by JohnTitor

It is now in the queue for this repository.

[bors]

⌛ Testing commit 572e11b with merge 45b431a...

[bors]

☀️ Test successful - checks-actions, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13, checks-cirrus-freebsd-14
Approved by: JohnTitor
Pushing 45b431a to master...