From f0d6c7c720946d4022d0dc27ba115ef46b1a02cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Fri, 29 Apr 2016 20:23:29 +0100
Subject: [PATCH 1/4] CI: Bump image

Since the base image is now 200MB smaller, this one too. Also updates
the SDK to 25.1.3.
---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a5140e56e..7a4db9434 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: mvdan/fdroid-ci:client-20160413
+image: mvdan/fdroid-ci:client-20160429
 
 cache:
   paths:

From 7bc130d81a467de58c280903439d33ff477e2ad5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Fri, 29 Apr 2016 20:46:25 +0100
Subject: [PATCH 2/4] wait-for-emulator: skip adb log messages

Otherwise, we'd interpret this as "booting", which is wrong:

     $ adb -e shell getprop init.svc.bootanim
    * daemon not running. starting it now on port 5037 *
    * daemon started successfully *
    error: no devices found
---
 tools/wait-for-emulator | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/wait-for-emulator b/tools/wait-for-emulator
index 1bb0defdb..7b772a250 100755
--- a/tools/wait-for-emulator
+++ b/tools/wait-for-emulator
@@ -24,7 +24,7 @@ while true; do
 	if [[ $sec -ge $timeout ]]; then
 		err "Timeout ($timeout seconds) reached - Failed to start emulator"
 	fi
-	out=$(adb -e shell getprop init.svc.bootanim 2>&1)
+	out=$(adb -e shell getprop init.svc.bootanim 2>&1 | grep -v '^\*')
 	if [[ "$out" =~ "command not found" ]]; then
 		err "$out"
 	fi

From 128d390e9cd1ca3346f86336081e651df8e5639e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Fri, 29 Apr 2016 20:49:19 +0100
Subject: [PATCH 3/4] wait-for-emulator: don't prepend "unknown"

This way, error lines like this one:

    Waiting for emulator to start: unknown: error: no devices found

Become:

    Waiting for emulator to start: error: no devices found
---
 tools/wait-for-emulator | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tools/wait-for-emulator b/tools/wait-for-emulator
index 7b772a250..97e3bb680 100755
--- a/tools/wait-for-emulator
+++ b/tools/wait-for-emulator
@@ -16,7 +16,7 @@ explain() {
 	elif [[ "$1" =~ "running" ]]; then
 		printf "booting"
 	else
-		printf "unknown: $1"
+		printf "$1"
 	fi
 }
 
@@ -31,10 +31,9 @@ while true; do
 	if [[ "$out" =~ "stopped" ]]; then
 		break
 	fi
-	exp=$(explain "$out")
 	let "r = sec % 5"
 	if [[ $r -eq 0 ]]; then
-		echo "Waiting for emulator to start: $exp"
+		echo "Waiting for emulator to start: $(explain "$out")"
 	fi
 	sleep 1
 	let "sec++"

From 37fe708f2bee7a0494d7012395115cf240cd17a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Fri, 29 Apr 2016 22:36:07 +0100
Subject: [PATCH 4/4] CI: Switch to 64-bit emulator

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7a4db9434..2b3e35ba4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,7 +36,7 @@ gradle:
         --name fcl-test
         --skin $SKIN
         --target android-$AVD_SDK
-    - emulator -force-32bit -avd fcl-test -no-skin -no-audio -no-window &
+    - emulator64-arm -avd fcl-test -no-skin -no-audio -no-window &
     - ./tools/wait-for-emulator
     - adb shell input keyevent 82
     - export EXITVALUE=0