Revert "Clean up travis build, hopefully fix the build"

This reverts commit e5192cfea4.
This commit is contained in:
Bradlee Speice 2014-11-09 23:55:29 -05:00
parent 907cd8527c
commit bbf2f059ad

View File

@ -1,20 +1,13 @@
language: android language: android
android:
components:
- build-tools-21.0.2
- sys-img-x86-android-21
- android-21
- extra-android-support
- extra-google-m2repository
- extra-android-m2repository
env: env:
matrix: matrix:
- ANDROID_SDKS=android-21,sysimg-21 ANDROID_TARGET=android-21 ANDROID_ABI=x86_64 - ANDROID_SDKS=android-19,sysimg-19 ANDROID_TARGET=android-19 ANDROID_ABI=armeabi-v7a
before_script: before_install:
- echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI
- emulator -avd test -no-skin -no-audio -no-window & - emulator -avd test -no-skin -no-audio -no-window &
before_script:
- bash ./wait_for_emulator - bash ./wait_for_emulator
- adb shell input keyevent 82 & - adb shell input keyevent 82 &