Merge pull request #65 from morphis/f/snapcraft-fix-deprecations

Update snapcraft build configuration and add snap logo
This commit is contained in:
Simon Fels 2017-04-07 14:28:34 +02:00 • committed by GitHub
commit a990398f0c
3 changed files with 13 additions and 12 deletions

View file

@ -3,5 +3,6 @@ Name=Anbox
GenericName=Android in a box GenericName=Android in a box
Version=1.0 Version=1.0
Type=Application Type=Application
Icon=${SNAP}/meta/gui/icon.png
Exec=anbox launch --package=org.anbox.appmgr --component=org.anbox.appmgr.AppViewActivity Exec=anbox launch --package=org.anbox.appmgr --component=org.anbox.appmgr.AppViewActivity
Terminal=false Terminal=false

BIN
setup/gui/icon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 60 KiB

View file

@ -18,18 +18,16 @@ apps:
parts: parts:
android-images: android-images:
plugin: copy plugin: dump
source: android-images source: android-images
files:
android.img: android.img
anbox-common: anbox-common:
plugin: copy plugin: dump
source: . source: scripts
files: organize:
scripts/snap-wrapper.sh: bin/anbox-wrapper.sh snap-wrapper.sh: bin/anbox-wrapper.sh
scripts/container-manager.sh: bin/container-manager.sh container-manager.sh: bin/container-manager.sh
scripts/anbox-bridge.sh: bin/anbox-bridge.sh anbox-bridge.sh: bin/anbox-bridge.sh
snap: prime:
- bin/anbox-bridge.sh - bin/anbox-bridge.sh
- bin/anbox-wrapper.sh - bin/anbox-wrapper.sh
- bin/container-manager.sh - bin/container-manager.sh
@ -62,7 +60,7 @@ parts:
- --disable-seccomp - --disable-seccomp
- --enable-capabilities - --enable-capabilities
- --with-rootfs-path=/var/snap/anbox/common/lxc/ - --with-rootfs-path=/var/snap/anbox/common/lxc/
snap: prime:
- bin/lxc-attach - bin/lxc-attach
- bin/lxc-ls - bin/lxc-ls
- bin/lxc-start - bin/lxc-start
@ -100,8 +98,10 @@ parts:
- libegl1-mesa-dev - libegl1-mesa-dev
- libgles2-mesa-dev - libgles2-mesa-dev
- libglib2.0-dev - libglib2.0-dev
- libglm-dev
- libgtest-dev - libgtest-dev
- libprotobuf-dev - libprotobuf-dev
- libproperties-cpp-dev
- libsdl2-dev - libsdl2-dev
- pkg-config - pkg-config
- protobuf-compiler - protobuf-compiler
@ -111,6 +111,6 @@ parts:
- libgl1-mesa-glx - libgl1-mesa-glx
- libsdl2-2.0-0 - libsdl2-2.0-0
- libsdl2-gfx-1.0-0 - libsdl2-gfx-1.0-0
snap: prime:
- usr/bin/anbox - usr/bin/anbox
- usr/lib/*-linux-*/ - usr/lib/*-linux-*/