From a0b31a9b20e741f3b1d5c175c6b52be69d9f4256 Mon Sep 17 00:00:00 2001
From: Simon Fels <morphis@gravedo.de>
Date: Fri, 25 May 2018 09:28:54 +0200
Subject: [PATCH 1/2] Limit snap architectures to amd64

We only support the snap for amd64 at the moment.
---
 snap/snapcraft.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 03d01e1..28b8be9 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -13,6 +13,7 @@ description: |
   separate the Android system fully from the host.
 confinement: devmode
 grade: devel
+architectures: [amd64]
 
 slots:
   # Depending on in which environment we're running we either need

From 0edb9427f4d095ff6e9d68e71f78847e3e1ea24c Mon Sep 17 00:00:00 2001
From: Simon Fels <morphis@gravedo.de>
Date: Fri, 25 May 2018 09:36:58 +0200
Subject: [PATCH 2/2] snap: add missing build dependency on systemd

---
 snap/snapcraft.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 28b8be9..9f6bcf3 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -201,7 +201,6 @@ parts:
       - libboost-thread-dev
       - libcap-dev
       - libdbus-1-dev
-      - libdbus-cpp-dev
       - libegl1-mesa-dev
       - libgles2-mesa-dev
       - libglib2.0-dev
@@ -210,6 +209,7 @@ parts:
       - libproperties-cpp-dev
       - libsdl2-dev
       - libsdl2-image-dev
+      - libsystemd-dev
       - pkg-config
       - protobuf-compiler
     stage-packages:
@@ -217,13 +217,13 @@ parts:
       - libboost-program-options1.58.0
       - libboost-thread1.58.0
       - libdb5.3
-      - libdbus-cpp5
       - libegl1-mesa
       - libgles2-mesa
       - libgl1-mesa-glx
       - libsdl2-2.0-0
       - libsdl2-gfx-1.0-0
       - libsdl2-image-2.0-0
+      - libsystemd0
     prime:
       - usr/bin/anbox
       - usr/share/anbox