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

Commit f8ebf6f0 authored by David Duarte's avatar David Duarte Committed by Automerger Merge Worker
Browse files

Merge "Remove grpc from apex" am: 4f5ccced 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2596745



Change-Id: I936dfb3506a9adc48ec8d87dafc53f678869c569
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 898d7118 4f5ccced

system/gd/rust/common/Android.bp

+27 −20
Original line number Diff line number Diff line
@@ -34,8 +34,34 @@ rust_library { 
            ],

        },

    },

    min_sdk_version: "Tiramisu",

}



rust_library {

    name: "libbt_common_only_init_flags",

    defaults: ["gd_rust_defaults"],

    crate_name: "bt_common",

    srcs: ["src/lib_only_init_flags.rs"],

    rustlibs: [

        "liblazy_static",

        "liblog_rust",

    ],

    target: {

        android: {

            rustlibs: [

                "libandroid_logger",

            ],

        },

        host: {

            rustlibs: [

                "libenv_logger",

            ],

        },

    },

    proc_macros: [

        "libpaste",

    ],

    apex_available: [

        "//apex_available:platform",

        "com.android.btservices",

    ],

    min_sdk_version: "Tiramisu",
@@ -80,9 +106,6 @@ rust_ffi_static { 
            ],

        },

    },

    apex_available: [

        "com.android.btservices",

    ],

    min_sdk_version: "30",

}
@@ -110,10 +133,6 @@ cc_library_static { 
        "-Wno-unused-const-variable",

    ],

    host_supported: true,

    apex_available: [

        "//apex_available:platform",

        "com.android.btservices",

    ],

    shared_libs: [

        "libchrome",

    ],
@@ -137,10 +156,6 @@ cc_library_static { 
        "libchrome",

    ],

    host_supported: true,

    apex_available: [

        "//apex_available:platform",

        "com.android.btservices",

    ],

    min_sdk_version: "30",

}
@@ -148,10 +163,6 @@ cc_library_headers { 
    name: "libbt_keystore_cc_headers",

    local_include_dirs: ["keystore"],

    host_supported: true,

    apex_available: [

        "//apex_available:platform",

        "com.android.btservices",

    ],

    min_sdk_version: "30",

}
@@ -163,10 +174,6 @@ cc_library_static { 
        "libbt_common_ffi",

    ],

    host_supported: true,

    apex_available: [

        "//apex_available:platform",

        "com.android.btservices",

    ],

    min_sdk_version: "30",

}

system/gd/rust/common/src/lib.rs

+2 −37
Original line number Diff line number Diff line 
//! Bluetooth common library



use init_flags::{

    get_log_level_for_tag, LOG_TAG_DEBUG, LOG_TAG_ERROR, LOG_TAG_FATAL, LOG_TAG_INFO,

    LOG_TAG_NOTICE, LOG_TAG_VERBOSE, LOG_TAG_WARN,

};



/// Provides waking timer abstractions

pub mod time;
@@ -26,38 +21,8 @@ pub mod init_flags; 
/// Provides runtime configured system properties. Stubbed for non-Android.

pub mod sys_prop;



fn get_log_level() -> log::Level {

    match get_log_level_for_tag("bluetooth_core") {

        LOG_TAG_FATAL => log::Level::Error,

        LOG_TAG_ERROR => log::Level::Error,

        LOG_TAG_WARN => log::Level::Warn,

        LOG_TAG_NOTICE => log::Level::Info,

        LOG_TAG_INFO => log::Level::Info,

        LOG_TAG_DEBUG => log::Level::Debug,

        LOG_TAG_VERBOSE => log::Level::Trace,

        _ => log::Level::Info, // default level

    }

}



/// Inits logging for Android

#[cfg(target_os = "android")]

pub fn init_logging() {

    android_logger::init_once(

        android_logger::Config::default().with_tag("bt").with_min_level(get_log_level()),

    );

    log::set_max_level(get_log_level().to_level_filter())

}



/// Inits logging for host

#[cfg(not(target_os = "android"))]

pub fn init_logging() {

    env_logger::Builder::new()

        .filter(None, get_log_level().to_level_filter())

        .parse_default_env()

        .try_init()

        .ok();

    log::set_max_level(get_log_level().to_level_filter())

}

mod logging;

pub use logging::*;



/// Indicates the object can be converted to a GRPC service

pub trait GrpcFacade {

system/gd/rust/common/src/lib_only_init_flags.rs

0 → 100644
+7 −0
Original line number Diff line number Diff line 
//! Bluetooth common library



/// Provides runtime configured-at-startup flags

pub mod init_flags;



mod logging;

pub use logging::*;

system/gd/rust/common/src/logging.rs

0 → 100644
+37 −0
Original line number Diff line number Diff line 
use crate::init_flags::{

    get_log_level_for_tag, LOG_TAG_DEBUG, LOG_TAG_ERROR, LOG_TAG_FATAL, LOG_TAG_INFO,

    LOG_TAG_NOTICE, LOG_TAG_VERBOSE, LOG_TAG_WARN,

};



fn get_log_level() -> log::Level {

    match get_log_level_for_tag("bluetooth_core") {

        LOG_TAG_FATAL => log::Level::Error,

        LOG_TAG_ERROR => log::Level::Error,

        LOG_TAG_WARN => log::Level::Warn,

        LOG_TAG_NOTICE => log::Level::Info,

        LOG_TAG_INFO => log::Level::Info,

        LOG_TAG_DEBUG => log::Level::Debug,

        LOG_TAG_VERBOSE => log::Level::Trace,

        _ => log::Level::Info, // default level

    }

}



/// Inits logging for Android

#[cfg(target_os = "android")]

pub fn init_logging() {

    android_logger::init_once(

        android_logger::Config::default().with_tag("bt").with_min_level(get_log_level()),

    );

    log::set_max_level(get_log_level().to_level_filter())

}



/// Inits logging for host

#[cfg(not(target_os = "android"))]

pub fn init_logging() {

    env_logger::Builder::new()

        .filter(None, get_log_level().to_level_filter())

        .parse_default_env()

        .try_init()

        .ok();

    log::set_max_level(get_log_level().to_level_filter())

}

system/gd/rust/facade/Android.bp

+0 −3
Original line number Diff line number Diff line
@@ -78,8 +78,5 @@ rust_library { 
        "libprotobuf_deprecated",

        "libtokio",

    ],

    apex_available: [

        "com.android.btservices",

    ],

    min_sdk_version: "30",

}