diff --git a/devices/Cargo.toml b/devices/Cargo.toml index bbf2884f88..ddcb783d3c 100644 --- a/devices/Cargo.toml +++ b/devices/Cargo.toml @@ -9,7 +9,7 @@ audio = [] audio_cras = ["libcras"] direct = [] gpu = ["gpu_display","rutabaga_gfx"] -tpm = ["protos/trunks", "tpm2"] +tpm = ["tpm2"] usb = [] video-decoder = ["libvda"] video-encoder = ["libvda"] diff --git a/protos/Cargo.toml b/protos/Cargo.toml index 98cd4ae2d2..d4286e6797 100644 --- a/protos/Cargo.toml +++ b/protos/Cargo.toml @@ -7,7 +7,6 @@ edition = "2018" [features] plugin = ["kvm_sys"] composite-disk = [] -trunks = [] [dependencies] kvm_sys = { path = "../kvm_sys", optional = true } diff --git a/protos/build.rs b/protos/build.rs index 37ab8b39a2..5aa3ca2558 100644 --- a/protos/build.rs +++ b/protos/build.rs @@ -29,15 +29,7 @@ struct ExternalProto { // Rustfmt bug: https://github.com/rust-lang/rustfmt/issues/3498 #[rustfmt::skip] -static EXTERNAL_PROTOS: &[ExternalProto] = &[ - #[cfg(feature = "trunks")] - ExternalProto { - dir_relative_to_sysroot: "usr/include/chromeos/dbus/trunks", - dir_relative_to_us: "../../../platform2/trunks", - proto_file_name: "trunks_interface.proto", - module: "trunks", - }, -]; +static EXTERNAL_PROTOS: &[ExternalProto] = &[]; struct LocalProto { // Corresponding to the input file src/$module.proto. diff --git a/protos/src/lib.rs b/protos/src/lib.rs index d73fb0352f..32c27eb5d7 100644 --- a/protos/src/lib.rs +++ b/protos/src/lib.rs @@ -9,8 +9,5 @@ mod generated { #[cfg(feature = "plugin")] pub mod plugin; -#[cfg(feature = "trunks")] -pub use generated::trunks; - #[cfg(feature = "composite-disk")] pub use generated::cdisk_spec; diff --git a/protos/tests/trunks.rs b/protos/tests/trunks.rs deleted file mode 100644 index 39723ae746..0000000000 --- a/protos/tests/trunks.rs +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2019 The Chromium OS Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#![cfg(feature = "trunks")] - -mod common; - -use crate::common::test_round_trip; -use protos::trunks::{SendCommandRequest, SendCommandResponse}; - -#[test] -fn send_command_request() { - let mut request = SendCommandRequest::new(); - request.set_command(b"...".to_vec()); - test_round_trip(request); -} - -#[test] -fn send_command_response() { - let mut response = SendCommandResponse::new(); - response.set_response(b"...".to_vec()); - test_round_trip(response); -}