From dbe65f03656d7698405368d18e5c8d0adc9f38c5 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 9 Apr 2019 23:58:07 +0200
Subject: [PATCH] gitlab-ci: fix emulator install for android-Q

---
 .gitlab-ci.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 857d06565..cfe786ebe 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -67,11 +67,12 @@ errorprone:
     - echo $AVD_PACKAGE
     - emulator -accel-check || true
 
-    - if [[ "$AVD_ARCH" != arm* ]]; then
+    - if [[ "$AVD_SDK" == Q ]]; then
+          set -x; echo y | sdkmanager --channel=3 "emulator" > /dev/null; set +x;
+    - elif [[ "$AVD_ARCH" != arm* ]]; then
           set -x; echo y | sdkmanager "emulator" > /dev/null; set +x;
-      elif [[ "$AVD_SDK" == Q ]]; then
-          set -x; echo y | sdkmanager --channel=2 "emulator" > /dev/null; set +x;
       fi
+    - grep Revision $ANDROID_HOME/emulator/source.properties
 
     - alias sdkmanager
     - echo y | sdkmanager "platforms;android-$AVD_SDK" > /dev/null
@@ -97,7 +98,7 @@ errorprone:
         -skip-adb-auth
         -verbose
         -wipe-data
-        -debug-all
+        -debug all,-hw_control,-qemud,-sensors,-surface
         &
     - wait-for-emulator
     - adb devices