From 2e479e26ee75f9dc1ac359165f6ed682b081fa8c Mon Sep 17 00:00:00 2001
From: Simon Fels <morphis@gravedo.de>
Date: Wed, 12 Apr 2017 18:52:41 +0200
Subject: [PATCH] Fix a few things in snapcraft.yaml to get the build back
 working

---
 snapcraft.yaml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 7f8a445c..0318ead4 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -19,14 +19,18 @@ apps:
 parts:
   android-images:
     plugin: dump
+    build-packages:
+      - wget
     install: |
       # 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/2017/04/12/android_1_amd64.img
-      mv anbox-android-1.img $SNAPCRAFT_PART_INSTALL/android.img
+      mv android_1_amd64.img $SNAPCRAFT_PART_INSTALL/android.img
+    prime:
+      - android.img
   anbox-common:
     plugin: dump
-    source: ../../scripts
+    source: scripts
     organize:
       snap-wrapper.sh: bin/anbox-wrapper.sh
       container-manager.sh: bin/container-manager.sh
@@ -75,7 +79,7 @@ parts:
     plugin: cmake
     after:
       - lxc
-    source: ../../
+    source: .
     configflags:
       # FIXME: Anbox currently has some paths with hard coded prefixes. Once
       # that is fixed we can avoid using a prefix here.
@@ -115,6 +119,8 @@ parts:
       - libgl1-mesa-glx
       - libsdl2-2.0-0
       - libsdl2-gfx-1.0-0
+    install: |
+      make test
     prime:
       - usr/bin/anbox
       - usr/lib/*-linux-*/
-- 
GitLab