diff options
| author | Frederick Mayle <fmayle@google.com> | 2024-04-16 22:44:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-16 22:44:01 +0000 |
| commit | 61c9a84871f705327e37883d4a637b7297766c43 (patch) | |
| tree | 717f3c1a4923e084a4cfde51ca9162b4a75f2994 /metrics/src/sys.rs | |
| parent | efb7605ac161ba257b8e442e1421e2ce4e161460 (diff) | |
| parent | 2a9a3407346fd09aa3ddf89d320e4700211cee5a (diff) | |
| download | crosvm-61c9a84871f705327e37883d4a637b7297766c43.tar.gz | |
Merge changes from topic "fmayle-crosvm-merge-04122024" into main
* changes:
UPSTREAM: base: fix musl build
Merge remote-tracking branch 'aosp/upstream-main'
Diffstat (limited to 'metrics/src/sys.rs')
| -rw-r--r-- | metrics/src/sys.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/metrics/src/sys.rs b/metrics/src/sys.rs index e0696cf17..64f09e4e2 100644 --- a/metrics/src/sys.rs +++ b/metrics/src/sys.rs @@ -6,6 +6,7 @@ cfg_if::cfg_if! { if #[cfg(windows)] { pub mod windows; pub use windows::*; + pub use metrics_events::sys::windows::*; } else if #[cfg(any(target_os = "android", target_os = "linux"))] { pub(crate) mod linux; } |