From 8790166c5f29552831bc9f1b000b31b37ecc8c6e Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Wed, 31 May 2017 14:13:34 +0200 Subject: [PATCH] Revert "Auto merge of #16566 - aneeshusa:remove-android-sdk-override, r=larsbergstrom" This reverts commit 779edd7c4aaf900f12fab378a378b0fc52d4c628, reversing changes made to 31c7198f71550995066de6673af749472f083121. --- 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 e6ef81fbcc4..8b84267dadf 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 ./mach build --android --dev - - env SERVO_RUSTC_LLVM_ASSERTIONS=1 ./mach package --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 - python ./etc/ci/check_dynamic_symbols.py android-nightly: - ./mach clean-nightlies --keep 3 --force - - env SERVO_RUSTC_LLVM_ASSERTIONS=1 ./mach build --android --release - - env SERVO_RUSTC_LLVM_ASSERTIONS=1 ./mach package --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 - ./mach upload-nightly android arm32: