diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-12-14 02:01:43 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-14 02:01:43 -0800 |
commit | 477a9827b82e880048038d9cc26b3000d013a3c4 (patch) | |
tree | 904743817526fb05a4b518f9db3757afc10b861d /python/tidy/servo_tidy | |
parent | 030cf90c57b5c51ce803c27dc3b036b7ce6a8002 (diff) | |
parent | 868ca2a3b0ef6c59f9e81e099ec5519454cb35c9 (diff) | |
download | servo-477a9827b82e880048038d9cc26b3000d013a3c4.tar.gz servo-477a9827b82e880048038d9cc26b3000d013a3c4.zip |
Auto merge of #14530 - mmatyas:android_injectedglue, r=larsbergstrom
Use `android-rs-injected-glue` on Android
<!-- Please describe your changes on the following line: -->
Due to changes in `android-rs-glue`, currently the Android build fails to start. As discussed [here](https://github.com/servo/servo/issues/13154), other than the `android-glue`, we now also have to inject some additional code too. This task is usually done by a helper program of `android-glue`, `cargo-apk`, but since Servo's build system is somewhat more complex than a regular small application, at the moment it'd be more clean to move the required internal `injected-glue` lib to a new repository, and add it as a dependency.
This patch adds a new dependency, `android-rs-injected-glue`, and integrates it into Servo. After applying this commit and #14528, Servo can be launched on Android. (It doesn't *work* yet as expected, though.)
Part of #13154.
---
<!-- 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
<!-- 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/14530)
<!-- Reviewable:end -->
Diffstat (limited to 'python/tidy/servo_tidy')
0 files changed, 0 insertions, 0 deletions