diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-05-11 10:32:52 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-11 10:32:52 -0500 |
| commit | 060a651f8847189e8d0830e35bbf4497014f01d5 (patch) | |
| tree | a00c04d957528bb0a1f87591aadc6c4d5d14ef08 | |
| parent | 973bf7af406eafc0f2056effaa0b50036ccad6b3 (diff) | |
| parent | a4a4d96e9cd6c7cd4209975475af0134692d3fb1 (diff) | |
| download | servo-060a651f8847189e8d0830e35bbf4497014f01d5.tar.gz servo-060a651f8847189e8d0830e35bbf4497014f01d5.zip | |
Auto merge of #16812 - MortimerGoro:update_blurdroid, r=jdm
Update blurdroid and set ANDROID_SDK in build_steps.yml
<!-- Please describe your changes on the following line: -->
See https://github.com/servo/saltfs/issues/661. Update blurdroid and set ANDROID_SDK in build_steps.yml
cc @aneeshusa @larsbergstrom
---
<!-- 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/16812)
<!-- Reviewable:end -->
| -rw-r--r-- | Cargo.lock | 6 | ||||
| -rw-r--r-- | etc/ci/buildbot_steps.yml | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Cargo.lock b/Cargo.lock index 521ac636562..0fe30b3fc17 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -241,7 +241,7 @@ dependencies = [ [[package]] name = "blurdroid" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -616,7 +616,7 @@ name = "device" version = "0.0.1" source = "git+https://github.com/servo/devices#1bb5a200c7ae1f42ddf3c42b235b3db66226aabf" dependencies = [ - "blurdroid 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "blurdroid 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "blurmock 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "blurz 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3390,7 +3390,7 @@ dependencies = [ "checksum bitflags 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1370e9fc2a6ae53aea8b7a5110edbd08836ed87c88736dfabccade1c2b44bff4" "checksum bitreader 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "80b13e2ab064ff3aa0bdbf1eff533f9822dc37899821f5f98c67f263eab51707" "checksum block 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" -"checksum blurdroid 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f4a86fbb3818e7f850410e026bfac7742fe86cbf4acf49f5752936b32d1f7eb8" +"checksum blurdroid 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "9880ddea1a97824ae9fc176f718e2a029491cd7d10bac4061ba4063569f4bc64" "checksum blurmock 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "68dd72da3a3bb40f3d3bdd366c4cf8e2b1d208c366304f382c80cef8126ca8da" "checksum blurz 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e73bda0f4c71c63a047351070097f3f507e6718e86b9ee525173371ef7b94b73" "checksum brotli 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "951f20a2cc403194b2746d9ac6f796292e3c0344e983c72c7d6bd6cff6c3d102" diff --git a/etc/ci/buildbot_steps.yml b/etc/ci/buildbot_steps.yml index 586732df875..529cf56caee 100644 --- a/etc/ci/buildbot_steps.yml +++ b/etc/ci/buildbot_steps.yml @@ -93,7 +93,7 @@ linux-nightly: android: - ./mach clean-nightlies --keep 3 --force - - env SERVO_RUSTC_LLVM_ASSERTIONS=1 ./mach build --android --dev + - env SERVO_RUSTC_LLVM_ASSERTIONS=1 ANDROID_SDK=/home/servo/android/sdk/r25.2.3 ./mach build --android --dev - env SERVO_RUSTC_LLVM_ASSERTIONS=1 ANDROID_SDK=/home/servo/android/sdk/r25.2.3 ./mach package --android --dev - bash ./etc/ci/lockfile_changed.sh - bash ./etc/ci/manifest_changed.sh @@ -101,7 +101,7 @@ android: android-nightly: - ./mach clean-nightlies --keep 3 --force - - env SERVO_RUSTC_LLVM_ASSERTIONS=1 ./mach build --android --release + - env SERVO_RUSTC_LLVM_ASSERTIONS=1 ANDROID_SDK=/home/servo/android/sdk/r25.2.3 ./mach build --android --release - env SERVO_RUSTC_LLVM_ASSERTIONS=1 ANDROID_SDK=/home/servo/android/sdk/r25.2.3 ./mach package --android --release - ./etc/ci/upload_nightly.sh android |