servo: Merge #11406 - Fix Android APK building (packaging) (from aneeshusa:add-missing-build-apk-semicolon); r=mbrubeck
authorAneesh Agrawal <aneeshusa@gmail.com>
Thu, 26 May 2016 21:48:17 -0500
changeset 338935 77e96730242d9191a03ab87ad2ced38d0a84d379
parent 338934 b227f7c5b183d2b098e04cae5a4250ab86a64edd
child 338936 66045207a206b663d3feeb38882b5f5d69191cce
push id31307
push usergszorc@mozilla.com
push dateSat, 04 Feb 2017 00:59:06 +0000
treeherdermozilla-central@94079d43835f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmbrubeck
servo: Merge #11406 - Fix Android APK building (packaging) (from aneeshusa:add-missing-build-apk-semicolon); r=mbrubeck 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. Source-Repo: https://github.com/servo/servo Source-Revision: 1efacd393843a761ee91c3a1765ef4801ccf18cc
servo/support/android/build-apk/src/main.rs
--- a/servo/support/android/build-apk/src/main.rs
+++ b/servo/support/android/build-apk/src/main.rs
@@ -25,17 +25,17 @@ fn main() {
 
     // Get the NDK path from NDK_HOME env.
     let ndk_path = env::var("NDK_HOME").ok().expect("Please set the NDK_HOME environment variable");
     let ndk_path = Path::new(&ndk_path);
 
     // 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());
     //  let standalone_path = Path::new(&standalone_path);
 
     let debug = passthrough.contains(&"-d".to_string());
 
     // Set the build directory that will contain all the necessary files to create the apk