Join GitHub today
GitHub is home to over 50 million developers working together to host and review code, manage projects, and build software together.
Sign upUse `android-rs-injected-glue` on Android #14530
Merged
Conversation
highfive
commented
Dec 9, 2016
|
|
|
cc @larsbergstrom @tomaka, what do you think? |
tomaka
commented
Dec 9, 2016
|
Looks good to me. |
|
@bors-servo r+ |
|
|
|
|
bors-servo
added a commit
that referenced
this pull request
Dec 13, 2016
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](#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 -->
|
|
|
@bors-servo retry
|
bors-servo
added a commit
that referenced
this pull request
Dec 14, 2016
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](#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 -->
|
|
|
@bors-servo: retry
|
bors-servo
added a commit
that referenced
this pull request
Dec 14, 2016
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](#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 -->
|
|
|
@bors-servo retry
|
bors-servo
added a commit
that referenced
this pull request
Dec 14, 2016
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](#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 -->
|
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
mmatyas commentedDec 9, 2016
•
edited by larsbergstrom
Due to changes in
android-rs-glue, currently the Android build fails to start. As discussed here, other than theandroid-glue, we now also have to inject some additional code too. This task is usually done by a helper program ofandroid-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 internalinjected-gluelib 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.
./mach build -ddoes not report any errors./mach test-tidydoes not report any errorsThis change is