mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2024-11-28 17:44:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

crosvm: Fix android and gfxstream build errors

Browse source 
BUG=b:236873276
TEST=`cargo build` in crosvm repo, `m crosvm` in android repo

Change-Id: I62cc00d10c5da0c0757821e173f3938aeb2badfb
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3735632
Tested-by: kokoro <noreply+kokoro@google.com>
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Auto-Submit: Frederick Mayle <fmayle@google.com>
This commit is contained in:
Frederick Mayle 2022-06-29 18:22:07 +00:00 committed by Chromeos LUCI
parent e30f4fda83
commit aeea40d6ff
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/crosvm/sys/unix/config.rs
View file

@ -98,7 +98,7 @@ pub fn check_ac97_backend(
// server is required for and exclusive to vios backend
#[cfg(target_os = "android")]
match ac97_params.backend {
Ac97Backend::VIOS => {
devices::Ac97Backend::VIOS => {
if ac97_params.vios_server_path.is_none() {
return Err(String::from("server argument is required for VIOS backend"));
}
@ -390,10 +390,10 @@ pub fn parse_gpu_options(s: &str) -> Result<GpuParameters, String> {
gpu_params.gfxstream_use_syncfd = false;
}
_ => {
return Err(argument::Error::InvalidValue {
value: v.to_string(),
expected: String::from("gpu parameter 'syncfd' should be a boolean"),
});
return Err(invalid_value_err(
v,
"gpu parameter 'syncfd' should be a boolean",
));
}
}
}
@ -495,7 +495,7 @@ pub fn parse_gpu_options(s: &str) -> Result<GpuParameters, String> {
#[cfg(feature = "gfxstream")]
{
if !vulkan_specified && gpu_params.mode == GpuMode::ModeGfxstream {
gpu_params.use_vulkan = sys::use_vulkan();
gpu_params.use_vulkan = use_vulkan();
}
if syncfd_specified || angle_specified {