Merge pull request #385 from jackwish/master

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

snapcraft.yaml

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