Revert "Auto merge of #16566 - aneeshusa:remove-android-sdk-override, r=larsbergstrom"

This reverts commit 779edd7c4a, reversing
changes made to 31c7198f71.
This commit is contained in:
Anthony Ramine 2017-05-31 14:13:34 +02:00
parent 779edd7c4a
commit 8790166c5f

View file

@ -111,16 +111,16 @@ linux-nightly:
android: android:
- ./mach clean-nightlies --keep 3 --force - ./mach clean-nightlies --keep 3 --force
- env SERVO_RUSTC_LLVM_ASSERTIONS=1 ./mach build --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 ./mach package --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/lockfile_changed.sh
- bash ./etc/ci/manifest_changed.sh - bash ./etc/ci/manifest_changed.sh
- python ./etc/ci/check_dynamic_symbols.py - python ./etc/ci/check_dynamic_symbols.py
android-nightly: android-nightly:
- ./mach clean-nightlies --keep 3 --force - ./mach clean-nightlies --keep 3 --force
- env SERVO_RUSTC_LLVM_ASSERTIONS=1 ./mach build --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 ./mach package --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 - ./mach upload-nightly android
arm32: arm32: