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

Remove trunks proto from crosvm build

Browse source 
The feature was never finished (crbug.com/911799), but adds a
build-time dependency on the trunks proto in platform2.

BUG=b:193267897
TEST=cargo build with and without tpm feature

Change-Id: I7299ba0779bb04ebca6284cfd11873e99500c993
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3043491
Tested-by: kokoro <noreply+kokoro@google.com>
Commit-Queue: Dennis Kempin <denniskempin@google.com>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
This commit is contained in:
Dennis Kempin 2021-07-21 15:35:27 -07:00 committed by Commit Bot
parent 2e14c730b8
commit 62770b484a
5 changed files with 2 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
devices/Cargo.toml
View file

@ -9,7 +9,7 @@ audio = []
audio_cras = ["libcras"] audio_cras = ["libcras"]
direct = [] direct = []
gpu = ["gpu_display","rutabaga_gfx"] gpu = ["gpu_display","rutabaga_gfx"]
tpm = ["protos/trunks", "tpm2"] tpm = ["tpm2"]
usb = [] usb = []
video-decoder = ["libvda"] video-decoder = ["libvda"]
video-encoder = ["libvda"] video-encoder = ["libvda"]

1
protos/Cargo.toml
View file

@ -7,7 +7,6 @@ edition = "2018"
[features] [features]
plugin = ["kvm_sys"] plugin = ["kvm_sys"]
composite-disk = [] composite-disk = []
trunks = []
[dependencies] [dependencies]
kvm_sys = { path = "../kvm_sys", optional = true } kvm_sys = { path = "../kvm_sys", optional = true }

10
protos/build.rs
View file

@ -29,15 +29,7 @@ struct ExternalProto {
// Rustfmt bug: https://github.com/rust-lang/rustfmt/issues/3498 // Rustfmt bug: https://github.com/rust-lang/rustfmt/issues/3498
#[rustfmt::skip] #[rustfmt::skip]
static EXTERNAL_PROTOS: &[ExternalProto] = &[ 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",
},
];
struct LocalProto { struct LocalProto {
// Corresponding to the input file src/$module.proto. // Corresponding to the input file src/$module.proto.

3
protos/src/lib.rs
View file

@ -9,8 +9,5 @@ mod generated {
#[cfg(feature = "plugin")] #[cfg(feature = "plugin")]
pub mod plugin; pub mod plugin;
#[cfg(feature = "trunks")]
pub use generated::trunks;
#[cfg(feature = "composite-disk")] #[cfg(feature = "composite-disk")]
pub use generated::cdisk_spec; pub use generated::cdisk_spec;

24
protos/tests/trunks.rs
View file

@ -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);
}