Set device to Nexus 4 and re-enable API 16, 17, and 18 emulator tests.

Fixes #2738.
bumptech · Dec 22, 2017 · 0e3172a · 0e3172a
1 parent ae202bc
commit 0e3172a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -20,10 +20,9 @@ env:
   matrix:
     - COMPONENT=unit
     - COMPONENT=firebase
-      # TODO(#2738): Re-enable these when we find a fix.
-      #    - COMPONENT=instrumentation ANDROID_TARGET=16
-      #    - COMPONENT=instrumentation ANDROID_TARGET=17
-      #    - COMPONENT=instrumentation ANDROID_TARGET=18
+    - COMPONENT=instrumentation ANDROID_TARGET=16
+    - COMPONENT=instrumentation ANDROID_TARGET=17
+    - COMPONENT=instrumentation ANDROID_TARGET=18
     - COMPONENT=instrumentation ANDROID_TARGET=19
     - COMPONENT=instrumentation ANDROID_TARGET=21
     - COMPONENT=instrumentation ANDROID_TARGET=22

diff --git a/scripts/travis_create_emulator.sh b/scripts/travis_create_emulator.sh
@@ -5,7 +5,7 @@ set -e
 target="system-images;android-${ANDROID_TARGET};default;armeabi-v7a"
 echo y | sdkmanager --update
 echo y | sdkmanager --install $target
-avdmanager create avd --force -n test -k $target --device "Nexus 5X" -c 2000M
+avdmanager create avd --force -n test -k $target --device "Nexus 4" -c 2048M
 QEMU_AUDIO_DRV=none $ANDROID_HOME/emulator/emulator -avd test -no-window -memory 2048 &
 
 exit 0