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

Commit acfd98b3 authored by Henri Chataing's avatar Henri Chataing
Browse files

system/btcore: Migrate to libbluetooth_log 

Test: m com.android.btservices
Bug: 305066880
Flag: EXEMPT, mechanical refactor
Change-Id: I90f3977a1f8e09394de4a83360a490212a870720
parent 9eacd34b

system/btcore/BUILD.gn

+5 −1
Original line number Diff line number Diff line
@@ -28,7 +28,10 @@ static_library("btcore") { 
    "//bt/system",

  ]



  configs += [ "//bt/system:target_defaults" ]

  configs += [

    "//bt/system:target_defaults",

    "//bt/system/log:log_defaults",

  ]



  deps = [

    "//bt/system/gd/rust/shim:init_flags_bridge_header",
@@ -57,6 +60,7 @@ if (use.test) { 
    configs += [

      "//bt/system:external_gtest_main",

      "//bt/system:target_defaults",

      "//bt/system/log:log_defaults",

    ]



    libs = [

system/btcore/src/module.cc

+14 −12
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include "btcore/include/module.h"



#include <base/logging.h>

#include <bluetooth/log.h>

#include <dlfcn.h>

#include <string.h>
@@ -32,6 +33,7 @@ 
#include "os/log.h"



using bluetooth::common::MessageLoopThread;

using namespace bluetooth;



typedef enum {

  MODULE_STATE_NONE = 0,
@@ -63,7 +65,7 @@ bool module_init(const module_t* module) { 
  CHECK(get_module_state(module) == MODULE_STATE_NONE);



  if (!call_lifecycle_function(module->init)) {

    LOG_ERROR("%s Failed to initialize module \"%s\"", __func__, module->name);

    log::error("Failed to initialize module \"{}\"", module->name);

    return false;

  }
@@ -81,12 +83,12 @@ bool module_start_up(const module_t* module) { 
  CHECK(get_module_state(module) == MODULE_STATE_INITIALIZED ||

        module->init == NULL);



  LOG_INFO("%s Starting module \"%s\"", __func__, module->name);

  log::info("Starting module \"{}\"", module->name);

  if (!call_lifecycle_function(module->start_up)) {

    LOG_ERROR("%s Failed to start up module \"%s\"", __func__, module->name);

    log::error("Failed to start up module \"{}\"", module->name);

    return false;

  }

  LOG_INFO("%s Started module \"%s\"", __func__, module->name);

  log::info("Started module \"{}\"", module->name);



  set_module_state(module, MODULE_STATE_STARTED);

  return true;
@@ -100,12 +102,12 @@ void module_shut_down(const module_t* module) { 
  // Only something to do if the module was actually started

  if (state < MODULE_STATE_STARTED) return;



  LOG_INFO("%s Shutting down module \"%s\"", __func__, module->name);

  log::info("Shutting down module \"{}\"", module->name);

  if (!call_lifecycle_function(module->shut_down)) {

    LOG_ERROR("%s Failed to shutdown module \"%s\". Continuing anyway.",

              __func__, module->name);

    log::error("Failed to shutdown module \"{}\". Continuing anyway.",

               module->name);

  }

  LOG_INFO("%s Shutdown of module \"%s\" completed", __func__, module->name);

  log::info("Shutdown of module \"{}\" completed", module->name);



  set_module_state(module, MODULE_STATE_INITIALIZED);

}
@@ -118,12 +120,12 @@ void module_clean_up(const module_t* module) { 
  // Only something to do if the module was actually initialized

  if (state < MODULE_STATE_INITIALIZED) return;



  LOG_INFO("%s Cleaning up module \"%s\"", __func__, module->name);

  log::info("Cleaning up module \"{}\"", module->name);

  if (!call_lifecycle_function(module->clean_up)) {

    LOG_ERROR("%s Failed to cleanup module \"%s\". Continuing anyway.",

              __func__, module->name);

    log::error("Failed to cleanup module \"{}\". Continuing anyway.",

               module->name);

  }

  LOG_INFO("%s Cleanup of module \"%s\" completed", __func__, module->name);

  log::info("Cleanup of module \"{}\" completed", module->name);



  set_module_state(module, MODULE_STATE_NONE);

}

system/device/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ cc_test { 
        "test/interop_test.cc",

    ],

    shared_libs: [

        "libbase",

        "liblog",

    ],

    static_libs: [
@@ -95,6 +96,7 @@ cc_test { 
        "test/device_iot_config_test.cc",

    ],

    shared_libs: [

        "libbase",

        "libdl",

        "liblog",

    ],

system/device/fuzzer/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ cc_fuzz { 
        "libbluetooth_headers",

    ],

    shared_libs: [

        "libbase",

        "libdl",

        "liblog",

        "server_configurable_flags",