aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-05-26 21:48:17 -0500
committerbors-servo <lbergstrom+bors@mozilla.com>2016-05-26 21:48:17 -0500
commit1efacd393843a761ee91c3a1765ef4801ccf18cc (patch)
treef6e312b2a4a3a7c73ae8829b65efb550ba541dae
parent126a197df8824047e810ffbf263efa567bf7d592 (diff)
parentfa33eefcbd58c2d702394d1ac2e1786893740db3 (diff)
downloadservo-1efacd393843a761ee91c3a1765ef4801ccf18cc.tar.gz
servo-1efacd393843a761ee91c3a1765ef4801ccf18cc.zip
Auto merge of #11406 - aneeshusa:add-missing-build-apk-semicolon, r=mbrubeck
Fix Android APK building (packaging) 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 --faster` does not report any errors - [ ] These changes help with #10339. Either: - [x] There are tests for these changes (android-nightly builder) OR - [ ] These changes do not require tests because _____ Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. I missed this syntax error during my review, and we don't check that packaging succeeds in regular build suite, but only as a Nightly build. @larsbergstrom should we run the packaging as part of the regular build? I think it is important that this continue to stay working, especially with #9918. In that case, the only difference with the nightly builder is whether or not to upload to S3. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11406) <!-- Reviewable:end -->
-rw-r--r--support/android/build-apk/src/main.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/support/android/build-apk/src/main.rs b/support/android/build-apk/src/main.rs
index 0440cce8711..234a37e9b51 100644
--- a/support/android/build-apk/src/main.rs
+++ b/support/android/build-apk/src/main.rs
@@ -30,7 +30,7 @@ fn main() {
// Get the target android platform from ANDROID_PLATFORM env. Expecting "android-{version}"
let android_platform = env::var("ANDROID_PLATFORM")
.ok()
- .expect("Please set the ANDROID_PLATFORM environment variable")
+ .expect("Please set the ANDROID_PLATFORM environment variable");
// Get the standalone NDK path from NDK_STANDALONE env.
// let standalone_path = env::var("NDK_STANDALONE").ok().unwrap_or("/opt/ndk_standalone".to_string());