mozilla-inbound: changeset 361494:ae809917d5db3293869402f858ce1cf5e4a72968

author	Aneesh Agrawal <aneeshusa@gmail.com>
	Tue, 30 May 2017 21:09:40 -0500
changeset 361494	ae809917d5db3293869402f858ce1cf5e4a72968
parent 361493	1de90f1305e0ac9074db07ed6d1fb432ec68d835
child 361495	f19a06e327df686aeb398d9e752cba8fb8dce6f3
push id	90875
push user	cbook@mozilla.com
push date	Wed, 31 May 2017 12:23:54 +0000
treeherder	mozilla-inbound@7061759a0b57 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	larsbergstrom
milestone	55.0a1
first release with	nightly linux32 7b8937970f9c / 55.0a1 / 20170531100318 / files nightly linux64 7b8937970f9c / 55.0a1 / 20170531100318 / files nightly mac 7b8937970f9c / 55.0a1 / 20170531030204 / files nightly win32 7b8937970f9c / 55.0a1 / 20170531030204 / files nightly win64 7b8937970f9c / 55.0a1 / 20170531030204 / files
last release without	nightly linux32 286f71223256 / 55.0a1 / 20170530100155 / files nightly linux64 286f71223256 / 55.0a1 / 20170530100155 / files nightly mac 286f71223256 / 55.0a1 / 20170530030204 / files nightly win32 286f71223256 / 55.0a1 / 20170530030204 / files nightly win64 286f71223256 / 55.0a1 / 20170530030204 / files

servo: Merge #16566 - Remove redundant ANDROID_SDK variables (from aneeshusa:remove-android-sdk-override); r=larsbergstrom The r25.2.3 Android SDK has been made the current version in saltfs, so we no longer need to override it via environment variable. Follow up to servo/servo#15773. Requires servo/saltfs#644.  ---  - [ ] `./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).  - [ ] There are tests for these changes OR - [ ] These changes do not require tests because _____   Source-Repo: https://github.com/servo/servo Source-Revision: 779edd7c4aaf900f12fab378a378b0fc52d4c628

--- a/servo/etc/ci/buildbot_steps.yml
+++ b/servo/etc/ci/buildbot_steps.yml
@@ -106,26 +106,26 @@ linux-rel-css:
 linux-nightly:
   - ./mach clean-nightlies --keep 3 --force
   - ./mach build --release
   - ./mach package --release
   - ./mach upload-nightly linux
 
 android:
   - ./mach clean-nightlies --keep 3 --force
-  - 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
+  - env SERVO_RUSTC_LLVM_ASSERTIONS=1 ./mach build --android --dev
+  - env SERVO_RUSTC_LLVM_ASSERTIONS=1 ./mach package --android --dev
   - bash ./etc/ci/lockfile_changed.sh
   - bash ./etc/ci/manifest_changed.sh
   - python ./etc/ci/check_dynamic_symbols.py
 
 android-nightly:
   - ./mach clean-nightlies --keep 3 --force
-  - 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
+  - env SERVO_RUSTC_LLVM_ASSERTIONS=1 ./mach build --android --release
+  - env SERVO_RUSTC_LLVM_ASSERTIONS=1 ./mach package --android --release
   - ./mach upload-nightly android
 
 arm32:
   - ./mach clean-nightlies --keep 3 --force
   - env SERVO_RUSTC_LLVM_ASSERTIONS=1 ./mach build --rel --target=arm-unknown-linux-gnueabihf
   - bash ./etc/ci/lockfile_changed.sh
   - bash ./etc/ci/manifest_changed.sh