another shot at travis

.travis.yml

@@ -1,5 +1,11 @@
 language: android
 jdk: openjdk7
+sudo: false
+env:
+    global:
+        - ANDROID_API_LEVEL=21
+        - ANDROID_ABI=armeabi-v7a
+        - ADB_INSTALL_TIMEOUT=8 # minutes (2 minutes by default)
 android:
     components:
         - build-tools-22.0.1
@@ -16,14 +22,13 @@ android:
         - 'android-sdk-preview-license-52d11cd2'
         - 'android-sdk-license-.+'
         - 'google-gdk-license-.+'
-# before_script:
-# - echo no | android create avd --force -n test -t android-21 --abi armeabi-v7a
-# - emulator -avd test -no-skin -no-audio -no-window &
-script:
-    - ./gradlew
-    - ./gradlew testDebug
-    - ./gradlew jacocoTestReport coveralls
 
-# don't run instrumentation tests for now
-# - android-wait-for-emulator && adb shell input keyevent 82 &
-# - ./gradlew connectedAndroidTest
+before_script:
+    - echo no | android create avd --force -n test -t android-$ANDROID_API_LEVEL --abi $ANDROID_ABI
+    - emulator -avd test -no-skin -no-audio -no-window &
+    - ./tools/android-wait-for-emulator
+    - adb shell input keyevent 82 &
+
+script:
+    - ./gradlew connectedAndroidTest
+    - ./gradlew testDebug jacocoTestReport coveralls