From d0e663b4707d708f7e158597ca7dff9bc0f759aa Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Wed, 27 Nov 2013 12:23:58 +0100
Subject: [PATCH] add support for copying goldfish android images out of the
 android package

---
 debian/changelog      | 6 ++++++
 live-build/auto/build | 6 ++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 832adc3a..db4b4273 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.201) UNRELEASED; urgency=low
+
+  * add support for copying goldfish android images out of the android package
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Wed, 27 Nov 2013 12:22:07 +0100
+
 livecd-rootfs (2.200) trusty; urgency=low
 
   * use proper quoting for egrep call in click installer
diff --git a/live-build/auto/build b/live-build/auto/build
index e209cd10..c7261f2c 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -410,7 +410,7 @@ if [ "$SUBARCH" = "ac100" ] || [ "$SUBARCH" = "nexus7" ]; then
 fi
 
 if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
-	touchsubarches="maguro manta grouper mako"
+	touchsubarches="maguro manta grouper mako goldfish"
 
 	sourceslist="chroot/etc/apt/sources.list"
 
@@ -446,8 +446,10 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
 			 "${PREFIX}.boot-armhf+${subarch}.img"
 		# drop this following line once cdimage can handle -boot-*.img
 		cp "${PREFIX}.boot-armhf+${subarch}.img" "${PREFIX}.bootimg-${subarch}"
+
+		# goldfish does not ship a .zip file, do not fail if it does not exist
 		cp chroot/usr/share/android/product/*-preinstalled-touch-armel+${subarch}.zip\
-			 "${PREFIX}.armel+${subarch}.zip"
+			 "${PREFIX}.armel+${subarch}.zip" || true
 	done
 
 	lb chroot_devpts remove "$@"