Skip to content

Commit

Permalink
Remove superfluous dependencies for cuttlefish-common
Browse files Browse the repository at this point in the history
None of these are required to build/run cuttlefish.

This causes 'vde' to be removed from capability_query.py since
the host no longer supports it with this change.
  • Loading branch information
Tristan Muntsinger committed Sep 16, 2019
1 parent 930526f commit 8156c58
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 37 deletions.
38 changes: 2 additions & 36 deletions debian/control
Expand Up @@ -4,60 +4,26 @@ Section: misc
Priority: optional
Standards-Version: 3.9.2
Build-Depends:
clang-3.8,
debhelper (>= 9),
libgflags-dev,
libgoogle-glog-dev,
libudev-dev,
libxml2-dev,
libjsoncpp-dev,
cdbs,
debhelper,
dh-buildinfo,
config-package-dev (>= 4.5~),
libnl-3-dev,
libnl-genl-3-dev,
debhelper (>= 9),
gcc

Package: cuttlefish-common
Architecture: any
Depends:
acl,
binutils,
binfmt-support [!amd64],
bridge-utils,
device-tree-compiler,
dnsmasq-base,
hostapd,
simg2img [amd64],
simg2img:amd64 [!amd64],
iptables,
libarchive-tools | bsdtar,
libdrm2,
libc6,
libc6:amd64 [!amd64],
libdrm2,
libfdt1,
libgoogle-glog0v5 | libgoogle-glog0,
libnl-genl-3-200,
libstdc++6,
libudev1,
libwayland-client0,
libwayland-server0,
libx11-6,
libxext6,
libxml2,
lzop,
psmisc,
python,
libc6:amd64 [!amd64],
qemu-user-binfmt [!amd64],
qemu-user-static [!amd64],
qemu-system-common (>= 2.8.0),
qemu-system-x86 (>= 2.8.0),
qemu-utils (>= 2.8.0),
rsync,
socat,
vde2,
${misc:Depends}
Description: Cuttlefish Android Virtual Device companion package.
Contains set of tools and binaries required to boot up and manage
Expand Down
2 changes: 1 addition & 1 deletion host/deploy/capability_query.py
Expand Up @@ -24,7 +24,7 @@
import sys

def main():
capabilities = {"capability_check", "qemu_cli", "vde", "vsock"}
capabilities = {"capability_check", "qemu_cli", "vsock"}
if len(sys.argv) == 1:
# Print all capabilities
print('\n'.join(capabilities))
Expand Down

0 comments on commit 8156c58

Please sign in to comment.