Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14a85a5b authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12420652 from 28b609e6 to 25Q1-release

Change-Id: Ic1acd001777df3e73ce7bf1d1f42bf11cb597bd1
parents c1d6112e 28b609e6
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line

//
// Copyright (C) 2023 The Android Open Source Project
//
@@ -28,6 +27,7 @@ cc_defaults {

cc_library {
    name: "libexpresslog",
    host_supported: true,
    defaults: ["expresslog_defaults"],
    cflags: [
        "-DNAMESPACE_FOR_HASH_FUNCTIONS=farmhash",
@@ -74,6 +74,7 @@ genrule {

cc_library_static {
    name: "libstatslog_express",
    host_supported: true,
    generated_sources: ["statslog_express.cpp"],
    generated_headers: ["statslog_express.h"],
    export_generated_headers: ["statslog_express.h"],
@@ -119,5 +120,5 @@ cc_test {
    ],
    shared_libs: [
        "libstatssocket",
    ]
    ],
}
+0 −1
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ rust_library {
    srcs: ["stats_pull.rs"],
    rustlibs: [
        "liblog_rust",
        "libonce_cell",
        "libstatslog_rust_header",
        "libstatspull_bindgen",
    ],
+3 −4
Original line number Diff line number Diff line
@@ -14,13 +14,12 @@

//! A Rust interface for the StatsD pull API.

use once_cell::sync::Lazy;
use statslog_rust_header::{Atoms, Stat, StatsError};
use statspull_bindgen::*;
use std::collections::HashMap;
use std::convert::TryInto;
use std::os::raw::c_void;
use std::sync::Mutex;
use std::sync::{LazyLock, Mutex};

/// The return value of callbacks.
pub type StatsPullResult = Vec<Box<dyn Stat>>;
@@ -107,8 +106,8 @@ impl Default for Metadata {
    }
}

static COOKIES: Lazy<Mutex<HashMap<i32, fn() -> StatsPullResult>>> =
    Lazy::new(|| Mutex::new(HashMap::new()));
static COOKIES: LazyLock<Mutex<HashMap<i32, fn() -> StatsPullResult>>> =
    LazyLock::new(|| Mutex::new(HashMap::new()));

/// # Safety
///
+0 −1
Original line number Diff line number Diff line
@@ -729,7 +729,6 @@ TEST(propertyinfoserializer, RealProperties) {
      {"sys.ims.QMI_DAEMON_STATUS", "u:object_r:qcom_ims_prop:s0"},
      {"sys.listeners.registered", "u:object_r:qseecomtee_prop:s0"},
      {"sys.logbootcomplete", "u:object_r:system_prop:s0"},
      {"sys.oem_unlock_allowed", "u:object_r:system_prop:s0"},
      {"sys.qcom.devup", "u:object_r:system_prop:s0"},
      {"sys.sysctl.extra_free_kbytes", "u:object_r:system_prop:s0"},
      {"sys.usb.config", "u:object_r:system_radio_prop:s0"},