commit 749de3692856555361b7239ada139c3a7846f66c
parent 4378a550079a7a7f773c5984eb39ba05b0a2d8e6
Author: gstraube <gstraube@mailbox.org>
Date: Wed, 9 Aug 2017 17:44:33 +0200
Revert "Use ARM system image"
This reverts commit 46b5e19ec334d229c61f54ade17f26ddc0d32452.
Diffstat:
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/.travis.yml b/.travis.yml
@@ -11,25 +11,24 @@ android:
- build-tools-25.0.3
- android-25
- extra-android-support
- - sys-img-armeabi-v7a-google_apis-25
before_install:
- mkdir "$ANDROID_HOME/licenses" || true
- echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
- echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
install:
- echo yes | sdkmanager "tools"
- - echo yes | sdkmanager "platforms;android-25" # Latest platform required by SDK tools
+ - echo yes | sdkmanager "platforms;android-25"
- echo yes | sdkmanager "extras;android;m2repository"
- echo yes | sdkmanager "extras;google;m2repository"
- echo yes | sdkmanager "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2"
- echo yes | sdkmanager "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2"
- - echo yes | sdkmanager "system-images;android-25;google_apis;armeabi-v7a"
+ - echo yes | sdkmanager "system-images;android-25;google_apis;x86_64"
licenses:
- android-sdk-license-.+
- '.+'
before_script:
- - echo no | avdmanager create avd --force -n test --tag google_apis --abi google_apis/armeabi-v7a -k 'system-images;android-25;google_apis;armeabi-v7a' --device 'Nexus 5X'
- - $ANDROID_HOME/tools/emulator -avd test -skin 1080x1920 -no-audio -no-window -verbose &
+ - echo no | avdmanager create avd --force -n test --tag google_apis --abi google_apis/x86_64 -k 'system-images;android-25;google_apis;x86_64' --device 'Nexus 5X'
+ - $ANDROID_HOME/tools/emulator -avd test -skin 1080x1920 -no-audio -no-window &
- android-wait-for-emulator
- adb shell input keyevent 82 &
notifications: