Skip to content

/ servo

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.

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

Publish a AAR with servoview #21199

Merged
merged 1 commit into from Aug 1, 2018
Merged

Publish a AAR with servoview #21199

merged 1 commit into from Aug 1, 2018
+395 −235

Conversation

@paulrouget
Copy link
Contributor

paulrouget commented Jul 18, 2018 •
edited by SimonSapin

Depends on #20912

Fix #21127

  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #__ (github issue number if applicable).
  • There are tests for these changes OR
  • These changes do not require tests because _____

This change is Reviewable
@highfive
Copy link

highfive commented Jul 18, 2018

Heads up! This PR modifies the following files:

  • @wafflespeanut: python/servo/bootstrap_commands.py, python/servo/command_base.py, python/servo/testing_commands.py, python/servo/package_commands.py, python/servo/build_commands.py and 1 more
  • @edunham: .travis.yml
  • @aneeshusa: etc/ci/buildbot_steps.yml
@highfive
Copy link

highfive commented Jul 18, 2018

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!
@paulrouget paulrouget force-pushed the paulrouget:aar branch from 89f7f00 to 6202b5e Jul 18, 2018
@paulrouget
Copy link
Contributor Author

paulrouget commented Jul 18, 2018

r? @MortimerGoro Please check only the last commit
@highfive highfive assigned MortimerGoro and unassigned nox Jul 18, 2018
@paulrouget paulrouget force-pushed the paulrouget:aar branch from 6202b5e to e554c81 Jul 18, 2018
@bors-servo
Copy link
Contributor

bors-servo commented Jul 18, 2018

☔ The latest upstream changes (presumably #21200) made this pull request unmergeable. Please resolve the merge conflicts.
@paulrouget paulrouget force-pushed the paulrouget:aar branch from e554c81 to e893757 Jul 20, 2018
@bors-servo
Copy link
Contributor

bors-servo commented Jul 21, 2018

☔ The latest upstream changes (presumably #21213) made this pull request unmergeable. Please resolve the merge conflicts.
@paulrouget paulrouget force-pushed the paulrouget:aar branch from e893757 to c31fb4c Jul 23, 2018
@paulrouget paulrouget mentioned this pull request Jul 23, 2018
Merged
@paulrouget paulrouget force-pushed the paulrouget:aar branch from c31fb4c to 21b832a Jul 27, 2018
@MortimerGoro
Copy link
Contributor

MortimerGoro commented Jul 27, 2018

@paulrouget r+ on the last commit
@bors-servo
Copy link
Contributor

bors-servo commented Jul 28, 2018

☔ The latest upstream changes (presumably #21242) made this pull request unmergeable. Please resolve the merge conflicts.
@paulrouget paulrouget force-pushed the paulrouget:aar branch from 21b832a to 924b8a7 Jul 30, 2018
@MortimerGoro
MortimerGoro requested changes Jul 30, 2018
View changes
support/android/apk/build.gradle
// Read environment variable used in rust build system
String ndkDir = System.getenv('ANDROID_NDK')
if (ndkDir == null) {
ndkDir = System.getenv('ANDROID_NDK_HOME')

This comment has been minimized.

Sign in to view
@MortimerGoro

MortimerGoro Jul 30, 2018

Contributor

We should also check ANDROID_NDK_ROOT. Some android devs use that: https://bugs.swift.org/browse/SR-1365
@bors-servo
Copy link
Contributor

bors-servo commented Jul 30, 2018

☔ The latest upstream changes (presumably #21250) made this pull request unmergeable. Please resolve the merge conflicts.
@paulrouget
Build a AAR archive alongside the APK
Loading status checks…
e8af185
@paulrouget paulrouget force-pushed the paulrouget:aar branch from 924b8a7 to e8af185 Aug 1, 2018
@MortimerGoro
MortimerGoro approved these changes Aug 1, 2018
View changes
@paulrouget
Copy link
Contributor Author

paulrouget commented Aug 1, 2018

@bors-servo r=MortimerGoro
@bors-servo
Copy link
Contributor

bors-servo commented Aug 1, 2018

📌 Commit e8af185 has been approved by MortimerGoro
@bors-servo
Copy link
Contributor

bors-servo commented Aug 1, 2018

⌛ Testing commit e8af185 with merge 3e09d72...
bors-servo added a commit that referenced this pull request Aug 1, 2018
@bors-servo
Auto merge of #21199 - paulrouget:aar, r=MortimerGoro
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
3e09d72 
Publish a AAR with servoview

Depends on #20912

Fix #21127

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [ ] `./mach build -d` does not report any errors
- [ ] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] 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/21199)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Aug 1, 2018

☀️ Test successful - android, android-x86, 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
Approved by: MortimerGoro
Pushing 3e09d72 to master...
@bors-servo bors-servo merged commit e8af185 into servo:master Aug 1, 2018
3 checks passed
3 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
bors-servo added a commit that referenced this pull request Aug 1, 2018
@bors-servo
Auto merge of #21234 - paulrouget:surface, r=MortimerGoro
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
0748842 
Android: Introduce ServoSurface

(WIP as it depends on 2 other PRs)

Depends on #21199. Only last commit matters.

r? @MortimerGoro

Please look at ServoSurface.java. The rest is mostly some refactoring to share as much code as possible with ServoView.

<!-- 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/21234)
<!-- Reviewable:end -->
bors-servo added a commit that referenced this pull request Aug 1, 2018
@bors-servo
Auto merge of #21234 - paulrouget:surface, r=MortimerGoro
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
733552d 
Android: Introduce ServoSurface

(WIP as it depends on 2 other PRs)

Depends on #21199. Only last commit matters.

r? @MortimerGoro

Please look at ServoSurface.java. The rest is mostly some refactoring to share as much code as possible with ServoView.

<!-- 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/21234)
<!-- Reviewable:end -->
@paulrouget paulrouget mentioned this pull request Aug 2, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MortimerGoro MortimerGoro

Assignees

@MortimerGoro MortimerGoro

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

Package ServoView into a AAR, and also expose a Surface
5 participants
@paulrouget @highfive @bors-servo @MortimerGoro @nox
You can’t perform that action at this time.