Support for Android arm64 compilations #17099
Conversation
|
Heads up! This PR modifies the following files:
|
highfive
added
the
S-awaiting-review
python/servo/build_commands.py
Outdated
| with cd(openssl_dir): | ||
| status = call( | ||
| make_cmd + ["-f", "openssl.makefile"], | ||
| env=env, | ||
| verbose=verbose) | ||
| if status: | ||
| return status | ||
| openssl_dir = path.join(openssl_dir, "openssl-1.0.1t") | ||
| openssl_dir = path.join(openssl_dir, "openssl-1.1.0f") |
There was a problem hiding this comment.
We can't suddenly update openssl in the middle of nowhere of a patch that is intended to support arm64, that change is out of scope.
There was a problem hiding this comment.
Ok, it makes sense to move the OpenSSL update into a separate PR. The reason for the update is that OpenSSL 1.1.0 comes with a compilation target ready for arm64, while 1.0.1 required a lot of hacking (and it's a out of support version)
|
We have decided to do the OpenSSL update into a separate PR before merging this. Let's wait for #17079 with the mirror and the new version. |
|
☔ The latest upstream changes (presumably #17240) made this pull request unmergeable. Please resolve the merge conflicts. |
|
Looks like #17079 landed, so this should be good to go after rebase! |
MortimerGoro
force-pushed
the
android_arm64
branch
from
1ce7d08
to
48fb715
Compare
|
@larsbergstrom Rebase ready! #17079 used OpenSSL 1.0.2 instead of 1.1. But I found a way to compile for aarch64 in 1.0.x. I want to add a ci build step for android64. Should I add the |
|
@bors-servo r+ @MortimerGoro Please just add them to the existing builders. Adding new build sections requires a significant amount of hacking & deployment on the saltfs side and there is some time to spare in our cross-builder configurations right now. |
|
📌 Commit 48fb715 has been approved by |
highfive
added
S-awaiting-merge
Support for Android arm64 compilations <!-- Please describe your changes on the following line: --> This PR is the final step to adds support for Android arm64 compilations. See #11921 for previous work. Fixes in this PR: - Fix js dependency compilation: servo/rust-mozjs#360 - Fix skia dependency link error: servo/skia#136 - Fix blurdroid dependency compilation: szeged/blurdroid#4 - Fix mio and net2 dependency compilations: tokio-rs/mio#599 - Fix gcc compiler name in the fake linker - Compile OpenSSL for aarch64 (update to stable 1.1.0 was required for this) --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [] These changes fix #__ (github issue number if applicable). <!-- Either: --> - [x] There are tests for these changes OR - [ ] These changes do not require tests because _____ <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17099) <!-- Reviewable:end -->
|
☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev |
highfive
removed
the
S-awaiting-merge
This PR is the final step to adds support for Android arm64 compilations. See #11921 for previous work.
Fixes in this PR:
./mach build -ddoes not report any errors./mach test-tidydoes not report any errorsThis change is