diff --git a/.travis.yml b/.travis.yml index 16c3b4ad..fc5ea180 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,8 @@ env: global: - ADB_INSTALL_TIMEOUT=8 # minutes (2 minutes by default) matrix: - #- ANDROID_TARGET=android-15 - #- ANDROID_TARGET=android-16 + - ANDROID_TARGET=android-15 + - ANDROID_TARGET=android-16 - ANDROID_TARGET=android-19 os: linux @@ -17,11 +17,11 @@ android: - build-tools-24.0.3 - android-24 - extra-android-m2repository - #- android-15 - #- android-16 + - android-15 + - android-16 - android-19 - #- sys-img-armeabi-v7a-android-15 - #- sys-img-armeabi-v7a-android-16 + - sys-img-armeabi-v7a-android-15 + - sys-img-armeabi-v7a-android-16 - sys-img-armeabi-v7a-android-19 matrix: diff --git a/scripts/before-test.sh b/scripts/before-test.sh index dc23bbc9..62ecc4ea 100755 --- a/scripts/before-test.sh +++ b/scripts/before-test.sh @@ -5,7 +5,7 @@ then sudo apt-get install python3 echo no | android create avd --force -n test -t $ANDROID_TARGET --abi armeabi-v7a - emulator -avd test -no-skin -no-audio -no-window & + emulator -avd test -no-skin -no-window & android-wait-for-emulator adb shell input keyevent 82 & ./gradlew squidb-tests:installDebug squidb-tests:installDebugAndroidTest