From 2c7489508f13c9ebdde617ba0c78617fd55809ba Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Fri, 17 Mar 2017 12:29:45 +0100
Subject: [PATCH] gitlab-ci: ensure compile platform is installed

Avoid broken builds when fdroidclient gets out of sync with
ci-images/client.

`emulator -no-skin` no longer does anything, but give a warning.
---
 .gitlab-ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a6ce6a091..7d8a715e3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,6 +7,8 @@ cache:
 
 before_script:
   - export GRADLE_USER_HOME=$PWD/.gradle
+  - export ANDROID_COMPILE_SDK=`sed -n 's,.*compileSdkVersion\s*\([0-9][0-9]*\).*,\1,p' app/build.gradle`
+  - echo y | android --silent update sdk --no-ui --filter android-${ANDROID_COMPILE_SDK}
 
 test:
   script:
@@ -53,7 +55,7 @@ connected24:
   variables:
     AVD_SDK: "24"
   script:
-    - emulator64-arm -avd fcl-test-$AVD_SDK -no-skin -no-audio -no-window &
+    - emulator64-arm -avd fcl-test-$AVD_SDK -no-audio -no-window &
     - ./tools/wait-for-emulator
     - adb shell input keyevent 82 &
     - export EXITVALUE=0