Merge pull request #385 from jackwish/master

snap build: prefer local android.img rather than always download

snapcraft.yaml

@@ -46,6 +46,15 @@ parts:
     build-packages:
       - wget
     install: |
+      LOCAL_IMAGE=$SNAPCRAFT_PART_INSTALL/../../../android-images/android.img
+
+      if [ -f $LOCAL_IMAGE ]; then
+
+        echo "Using local image $LOCAL_IMAGE"
+        cp $LOCAL_IMAGE $SNAPCRAFT_PART_INSTALL/android.img
+
+      else
+
         IMAGE_PATH=
         IMAGE_NAME=
         ARCH=$(uname -m)
@@ -53,23 +62,25 @@ parts:
         case "$ARCH" in
           x86_64)
             IMAGE_PATH="2017/07/13"
-          IMAGE_NAME="android_3_amd64"
+            IMAGE_NAME="android_3_amd64.img"
             ;;
           arm*)
             IMAGE_PATH="2017/06/12"
-          IMAGE_NAME="android_1_armhf"
+            IMAGE_NAME="android_1_armhf.img"
             ;;
-      esac
-
-      if [ -z "$IMAGE_PATH" ] || [ -z "$IMAGE_NAME" ]; then
+          *)
             echo "ERROR: Unknown architecture $ARCH"
             exit 1
-      fi
+            ;;
+        esac
 
         # FIXME: downloading with a source: field doesn't work as snapcraft
         # expects the downloaded file to be an archive it can extract.
-      wget http://build.anbox.io/android-images/$IMAGE_PATH/$IMAGE_NAME.img
-      mv $IMAGE_NAME.img $SNAPCRAFT_PART_INSTALL/android.img
+        echo "Downloading image..."
+        wget http://build.anbox.io/android-images/$IMAGE_PATH/$IMAGE_NAME
+        mv $IMAGE_NAME $SNAPCRAFT_PART_INSTALL/android.img
+
+      fi
     prime:
       - android.img
   anbox-common: