diff options
| author | Andrew Walbran <qwandor@google.com> | 2022-08-24 10:55:16 +0000 |
|---|---|---|
| committer | Andrew Walbran <qwandor@google.com> | 2022-11-25 15:23:40 +0000 |
| commit | 3a957469aeb265b0554c975773210957ae3ecd3b (patch) | |
| tree | bf5e07ac6ffd39f5fda6d7e00d364024b66b843a | |
| parent | 1884da105146be16a73e6d2546c7e52c93efd32d (diff) | |
| download | native-3a957469aeb265b0554c975773210957ae3ecd3b.tar.gz | |
No need for lazy_static as Mutex::new is now const.
This changed in Rust 1.63.
Bug: 242288711
Test: m virtualizationservice
Change-Id: I07fc300f85a2890656b1c091f68a9d47f4802e0c
| -rw-r--r-- | libs/binder/rust/Android.bp | 2 | ||||
| -rw-r--r-- | libs/binder/rust/src/native.rs | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/libs/binder/rust/Android.bp b/libs/binder/rust/Android.bp index 738d16ac66..afd414a7cb 100644 --- a/libs/binder/rust/Android.bp +++ b/libs/binder/rust/Android.bp @@ -17,7 +17,6 @@ rust_library { rustlibs: [ "libbinder_ndk_sys", "libdowncast_rs", - "liblazy_static", "liblibc", ], host_supported: true, @@ -160,7 +159,6 @@ rust_test { rustlibs: [ "libbinder_ndk_sys", "libdowncast_rs", - "liblazy_static", "liblibc", ], } diff --git a/libs/binder/rust/src/native.rs b/libs/binder/rust/src/native.rs index dee05d07cf..6f686fbd93 100644 --- a/libs/binder/rust/src/native.rs +++ b/libs/binder/rust/src/native.rs @@ -22,7 +22,6 @@ use crate::parcel::{BorrowedParcel, Serialize}; use crate::proxy::SpIBinder; use crate::sys; -use lazy_static::lazy_static; use std::convert::TryFrom; use std::ffi::{c_void, CStr, CString}; use std::fs::File; @@ -508,10 +507,8 @@ pub struct LazyServiceGuard { _private: (), } -lazy_static! { - // Count of how many LazyServiceGuard objects are in existence. - static ref GUARD_COUNT: Mutex<u64> = Mutex::new(0); -} +// Count of how many LazyServiceGuard objects are in existence. +static GUARD_COUNT: Mutex<u64> = Mutex::new(0); impl LazyServiceGuard { /// Create a new LazyServiceGuard to prevent the service manager prematurely killing this |