| commit | 592c874fba13b1c2617ce08dbc429cdae6614a70 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Dec 05 21:32:33 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 05 21:32:33 2024 +0000 |
| tree | 9e4d3e39291e3175333805ce983db5dc9a455c74 | |
| parent | 7fd57ddbbf2664689e1581387671e166dc963fb5 [diff] | |
| parent | beb25d59d6f2bb4a9ab45b2f1d91ea2874e79ce2 [diff] |
Merge "Temporary workaround for Rust 1.82.0 update" into main am: 4da9242e2f am: beb25d59d6 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3393025 Change-Id: If96c08f80c936fbe9aedeac654257249ad83c6b0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libs/libvmbase/src/bionic.rs b/libs/libvmbase/src/bionic.rs index 8b40dae..3c0cd6f 100644 --- a/libs/libvmbase/src/bionic.rs +++ b/libs/libvmbase/src/bionic.rs
@@ -72,6 +72,7 @@ pub static mut ERRNO: c_int = 0; #[no_mangle] +#[allow(unused_unsafe)] unsafe extern "C" fn __errno() -> *mut c_int { // SAFETY: C functions which call this are only called from the main thread, not from exception // handlers.
diff --git a/libs/libvmbase/src/layout.rs b/libs/libvmbase/src/layout.rs index 9a702b0..cf3a8fc 100644 --- a/libs/libvmbase/src/layout.rs +++ b/libs/libvmbase/src/layout.rs
@@ -14,6 +14,8 @@ //! Memory layout. +#![allow(unused_unsafe)] + pub mod crosvm; use crate::linker::__stack_chk_guard;