diff options
| author | 2022-11-28 20:30:47 +0000 | |
|---|---|---|
| committer | 2022-11-28 20:30:47 +0000 | |
| commit | a3232bf4d89f7bae497d5d58f52ce7234851836c (patch) | |
| tree | c5d88a0eca265ba9c357537a36b3fe658868aa25 /libs | |
| parent | 82251b19e531ee3d182f79bf82d4d35eea390f5a (diff) | |
| parent | ce673ae8100d69c2de62e24b6066494a858592dd (diff) | |
Merge "No need for lazy_static as Mutex::new is now const." am: a236a2c136 am: 6854c53510 am: ce673ae810
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2193646
Change-Id: I595fcb5575d4aff84c217ef724a6317ab6308636
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs')
| -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 |