From a6b9ca338879b502b33ec48ca82ec60dcaa170f9 Mon Sep 17 00:00:00 2001
From: Zach Reizner <zachr@google.com>
Date: Wed, 13 Mar 2019 17:02:32 -0700
Subject: [PATCH] usb: remove unused usb-emulation feature flag

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>
---
 Cargo.lock         | 1 -
 Cargo.toml         | 4 +---
 devices/Cargo.toml | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 77b4e4dd03..1014fe97e9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -108,7 +108,6 @@ dependencies = [
  "resources 0.1.0",
  "sync 0.1.0",
  "sys_util 0.1.0",
- "usb_util 0.1.0",
  "vhost 0.1.0",
  "vm_control 0.1.0",
  "x86_64 0.1.0",
diff --git a/Cargo.toml b/Cargo.toml
index ed06b35c6f..23fce2107c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -24,10 +24,9 @@ plugin = ["plugin_proto", "crosvm_plugin", "protobuf"]
 default-no-sandbox = []
 wl-dmabuf = ["devices/wl-dmabuf", "gpu_buffer", "resources/wl-dmabuf"]
 gpu = ["devices/gpu"]
-usb-emulation = ["usb_util"]
 tpm = ["devices/tpm"]
 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]
 arch = { path = "arch" }
@@ -41,7 +40,6 @@ kvm = { path = "kvm" }
 kvm_sys = { path = "kvm_sys" }
 msg_socket = { path = "msg_socket" }
 sys_util = "*"
-usb_util = { path = "usb_util", optional = true }
 kernel_cmdline = { path = "kernel_cmdline" }
 kernel_loader = { path = "kernel_loader" }
 libc = "=0.2.44"
diff --git a/devices/Cargo.toml b/devices/Cargo.toml
index 13ccb2284e..79d43674a5 100644
--- a/devices/Cargo.toml
+++ b/devices/Cargo.toml
@@ -7,7 +7,7 @@ authors = ["The Chromium OS Authors"]
 wl-dmabuf = []
 gpu = ["gpu_buffer", "gpu_display", "gpu_renderer"]
 tpm = ["tpm2"]
-sandboxed-libusb = []
+sandboxed-libusb = ["usb_util/sandboxed-libusb"]
 
 [dependencies]
 audio_streams = "*"