From 16ed388a8a669dfc46471101dac5a6016cdba908 Mon Sep 17 00:00:00 2001 From: Aneesh Agrawal Date: Fri, 21 Apr 2017 19:52:36 -0400 Subject: [PATCH] Remove redundant ANDROID_SDK variables 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. --- etc/ci/buildbot_steps.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/etc/ci/buildbot_steps.yml b/etc/ci/buildbot_steps.yml index 8b84267dadf..e6ef81fbcc4 100644 --- a/etc/ci/buildbot_steps.yml +++ b/etc/ci/buildbot_steps.yml @@ -111,16 +111,16 @@ linux-nightly: 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: