mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2025-02-05 18:20:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

usb: remove unused usb-emulation feature flag

Browse source 
This cleans up some feature flag plumping for libusb sandboxing as well.

BUG=chromium:831850
TEST=cargo test
CQ-DEPEND=CL:1512762

Change-Id: Ic70784db204ddced94498944b021bcb7dd708bb1
Reviewed-on: https://chromium-review.googlesource.com/1522214
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: Jingkui Wang <jkwang@google.com>
Reviewed-by: Jingkui Wang <jkwang@google.com>
This commit is contained in:
Zach Reizner 2019-03-13 17:02:32 -07:00 committed by chrome-bot
parent 100e6e48ad
commit a6b9ca3388
3 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Cargo.lock generated
View file

@ -108,7 +108,6 @@ dependencies = [
"resources 0.1.0", "resources 0.1.0",
"sync 0.1.0", "sync 0.1.0",
"sys_util 0.1.0", "sys_util 0.1.0",
"usb_util 0.1.0",
"vhost 0.1.0", "vhost 0.1.0",
"vm_control 0.1.0", "vm_control 0.1.0",
"x86_64 0.1.0", "x86_64 0.1.0",

4
Cargo.toml
View file

@ -24,10 +24,9 @@ plugin = ["plugin_proto", "crosvm_plugin", "protobuf"]
default-no-sandbox = [] default-no-sandbox = []
wl-dmabuf = ["devices/wl-dmabuf", "gpu_buffer", "resources/wl-dmabuf"] wl-dmabuf = ["devices/wl-dmabuf", "gpu_buffer", "resources/wl-dmabuf"]
gpu = ["devices/gpu"] gpu = ["devices/gpu"]
usb-emulation = ["usb_util"]
tpm = ["devices/tpm"] tpm = ["devices/tpm"]
gpu-forward = ["render_node_forward"] gpu-forward = ["render_node_forward"]
sandboxed-libusb = ["devices/sandboxed-libusb", "usb_util/sandboxed-libusb", "vm_control/sandboxed-libusb"] sandboxed-libusb = ["devices/sandboxed-libusb", "vm_control/sandboxed-libusb"]
[dependencies] [dependencies]
arch = { path = "arch" } arch = { path = "arch" }
@ -41,7 +40,6 @@ kvm = { path = "kvm" }
kvm_sys = { path = "kvm_sys" } kvm_sys = { path = "kvm_sys" }
msg_socket = { path = "msg_socket" } msg_socket = { path = "msg_socket" }
sys_util = "*" sys_util = "*"
usb_util = { path = "usb_util", optional = true }
kernel_cmdline = { path = "kernel_cmdline" } kernel_cmdline = { path = "kernel_cmdline" }
kernel_loader = { path = "kernel_loader" } kernel_loader = { path = "kernel_loader" }
libc = "=0.2.44" libc = "=0.2.44"

2
devices/Cargo.toml
View file

@ -7,7 +7,7 @@ authors = ["The Chromium OS Authors"]
wl-dmabuf = [] wl-dmabuf = []
gpu = ["gpu_buffer", "gpu_display", "gpu_renderer"] gpu = ["gpu_buffer", "gpu_display", "gpu_renderer"]
tpm = ["tpm2"] tpm = ["tpm2"]
sandboxed-libusb = [] sandboxed-libusb = ["usb_util/sandboxed-libusb"]
[dependencies] [dependencies]
audio_streams = "*" audio_streams = "*"