Introduce emulator variant env variable

.travis.yml

@@ -6,24 +6,24 @@ services:
 
 env:
 # EMULATOR_API_LEVEL=14 x86 is not published. 
-  - EMULATOR_API_LEVEL=15 EMULATOR_ARCH=x86
-  - EMULATOR_API_LEVEL=16 EMULATOR_ARCH=x86
-  - EMULATOR_API_LEVEL=17 EMULATOR_ARCH=x86
-  - EMULATOR_API_LEVEL=18 EMULATOR_ARCH=x86
-  - EMULATOR_API_LEVEL=19 EMULATOR_ARCH=x86
+  - EMULATOR_API_LEVEL=15 EMULATOR_VARIANT=google_apis EMULATOR_ARCH=x86
+  - EMULATOR_API_LEVEL=16 EMULATOR_VARIANT=google_apis EMULATOR_ARCH=x86
+  - EMULATOR_API_LEVEL=17 EMULATOR_VARIANT=google_apis EMULATOR_ARCH=x86
+  - EMULATOR_API_LEVEL=18 EMULATOR_VARIANT=google_apis EMULATOR_ARCH=x86
+  - EMULATOR_API_LEVEL=19 EMULATOR_VARIANT=google_apis EMULATOR_ARCH=x86
 # EMULATOR_API_LEVEL=20 is not published at all.
-  - EMULATOR_API_LEVEL=21 EMULATOR_ARCH=x86_64
-  - EMULATOR_API_LEVEL=22 EMULATOR_ARCH=x86_64
-  - EMULATOR_API_LEVEL=23 EMULATOR_ARCH=x86_64
-  - EMULATOR_API_LEVEL=24 EMULATOR_ARCH=x86_64
-  - EMULATOR_API_LEVEL=25 EMULATOR_ARCH=x86_64
-  - EMULATOR_API_LEVEL=26 EMULATOR_ARCH=x86_64   
-  - EMULATOR_API_LEVEL=27 EMULATOR_ARCH=x86   
-  - EMULATOR_API_LEVEL=28 EMULATOR_ARCH=x86_64
+  - EMULATOR_API_LEVEL=21 EMULATOR_VARIANT=google_apis EMULATOR_ARCH=x86_64
+  - EMULATOR_API_LEVEL=22 EMULATOR_VARIANT=google_apis EMULATOR_ARCH=x86_64
+  - EMULATOR_API_LEVEL=23 EMULATOR_VARIANT=google_apis EMULATOR_ARCH=x86_64
+  - EMULATOR_API_LEVEL=24 EMULATOR_VARIANT=google_apis EMULATOR_ARCH=x86_64
+  - EMULATOR_API_LEVEL=25 EMULATOR_VARIANT=google_apis EMULATOR_ARCH=x86_64
+  - EMULATOR_API_LEVEL=26 EMULATOR_VARIANT=google_apis EMULATOR_ARCH=x86_64
+  - EMULATOR_API_LEVEL=27 EMULATOR_VARIANT=google_apis EMULATOR_ARCH=x86
+  - EMULATOR_API_LEVEL=28 EMULATOR_VARIANT=google_apis EMULATOR_ARCH=x86_64
 
 before_install:
   - docker info
 
 script:
-  - docker build --build-arg EMULATOR_API_LEVEL --build-arg EMULATOR_ARCH -t android-emulator-$EMULATOR_API_LEVEL android-emulator/
+  - docker build --build-arg EMULATOR_API_LEVEL --build-arg EMULATOR_VARIANT --build-arg EMULATOR_ARCH -t android-emulator-$EMULATOR_API_LEVEL android-emulator/
   - docker run -it --rm --env EMULATOR_API_LEVEL --volume=$(pwd)/android-emulator:/opt/workspace --entrypoint /opt/workspace/start-emulator.sh android-emulator-$EMULATOR_API_LEVEL

android-emulator/Dockerfile

@@ -71,6 +71,7 @@ ENV PATH ${ANDROID_SDK_ROOT}/emulator:${ANDROID_SDK_ROOT}/tools/bin:${ANDROID_SD
 ARG BUILD_TOOLS_VERSION=28.0.3
 ARG PLATFORM_API_LEVEL=28
 ARG EMULATOR_API_LEVEL=28
+ARG EMULATOR_VARIANT=google_apis
 ARG EMULATOR_ARCH=x86_64
 
 # Update AndroidSDK
@@ -80,14 +81,14 @@ RUN yes 'y' | sdkmanager --licenses >/dev/null \
     "emulator" \
     "platform-tools" \
     "platforms;android-${PLATFORM_API_LEVEL}" \
-    "system-images;android-${EMULATOR_API_LEVEL};google_apis;${EMULATOR_ARCH}" \
+    "system-images;android-${EMULATOR_API_LEVEL};${EMULATOR_VARIANT};${EMULATOR_ARCH}" \
     "tools" >/dev/null
 
 # Create AVD
 RUN yes 'n' | avdmanager --silent create avd \
     --name android-emulator-${EMULATOR_API_LEVEL} \
     --device "4in WVGA (Nexus S)" \
-    --package "system-images;android-${EMULATOR_API_LEVEL};google_apis;${EMULATOR_ARCH}"
+    --package "system-images;android-${EMULATOR_API_LEVEL};${EMULATOR_VARIANT};${EMULATOR_ARCH}"
 
 # GO to workspace
 WORKDIR /opt/workspace