Merge changes from topic "fmayle-crosvm-merge-04122024" into main

* changes:
  UPSTREAM: base: fix musl build
  Merge remote-tracking branch 'aosp/upstream-main'

1 files changed, 0 insertions, 4 deletions

diff --git a/gpu_display/src/sys/windows.rs b/gpu_display/src/sys/windows.rs
index 96ad10693..bb9feb44c 100644
--- a/gpu_display/src/sys/windows.rs
+++ b/gpu_display/src/sys/windows.rs
@@ -11,7 +11,6 @@ use base::SendTube;
 use base::WaitContext;
 use metrics::sys::windows::Metrics;
 
-use crate::gpu_display_win::DisplayProperties;
 use crate::gpu_display_win::DisplayWin;
 use crate::DisplayEventToken;
 use crate::DisplayT;
@@ -65,7 +64,6 @@ pub trait WinGpuDisplayExt {
     fn open_winapi(
         wndproc_thread: WindowProcedureThread,
         win_metrics: Option<Weak<Metrics>>,
-        display_properties: DisplayProperties,
         gpu_display_wait_descriptor_ctrl: SendTube,
         vulkan_display_create_params: Option<VulkanCreateParams>,
     ) -> GpuDisplayResult<GpuDisplay>;
@@ -75,14 +73,12 @@ impl WinGpuDisplayExt for GpuDisplay {
     fn open_winapi(
         wndproc_thread: WindowProcedureThread,
         win_metrics: Option<Weak<Metrics>>,
-        display_properties: DisplayProperties,
         gpu_display_wait_descriptor_ctrl: SendTube,
         vulkan_display_create_params: Option<VulkanCreateParams>,
     ) -> GpuDisplayResult<GpuDisplay> {
         let display = DisplayWin::new(
             wndproc_thread,
             win_metrics,
-            display_properties,
             gpu_display_wait_descriptor_ctrl,
             vulkan_display_create_params,
         )?;