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

Commit 4fee9b94 authored by Chen Chen's avatar Chen Chen Committed by Automerger Merge Worker
Browse files

Merge "BluetoothMetrics: Add counter metrics in GD cpp" am: df1d2145 

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

Change-Id: I0546df8aff601907d7d3479a1188628eff67e786
parents cde1f728 df1d2145

system/gd/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ cc_defaults { 
        ":BluetoothHciSources",

        ":BluetoothIsoSources",

        ":BluetoothL2capSources",

        ":BluetoothMetricsSources",

        ":BluetoothNeighborSources",

        ":BluetoothPacketSources",

        ":BluetoothShimSources",
@@ -353,6 +354,7 @@ cc_test { 
        ":BluetoothHalTestSources",

        ":BluetoothHciUnitTestSources",

        ":BluetoothL2capUnitTestSources",

        ":BluetoothMetricsTestSources",

        ":BluetoothPacketTestSources",

        ":BluetoothShimTestSources",

        ":BluetoothSecurityUnitTestSources",

system/gd/BUILD.gn

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ static_library("libbluetooth_gd") { 
    "//bt/system/gd/hal:BluetoothHalSources",

    "//bt/system/gd/hal:BluetoothHalSources_hci_host",

    "//bt/system/gd/l2cap:BluetoothL2capSources",

    "//bt/system/gd/metrics:BluetoothMetricsSources",

    "//bt/system/gd/neighbor:BluetoothNeighborSources",

    "//bt/system/gd/security:BluetoothSecuritySources",

    "//bt/system/gd/shim:BluetoothShimSources",

system/gd/hal/hci_hal_host.cc

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 


#include "hal/hci_hal.h"

#include "hal/snoop_logger.h"

#include "metrics/counter_metrics.h"

#include "os/log.h"

#include "os/reactor.h"

#include "os/thread.h"
@@ -262,6 +263,7 @@ class HciHalHost : public HciHal { 


 protected:

  void ListDependencies(ModuleList* list) const {

    list->add<metrics::CounterMetrics>();

    list->add<SnoopLogger>();

  }

system/gd/hal/hci_hal_host_rootcanal.cc

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 


#include "hal/hci_hal.h"

#include "hal/snoop_logger.h"

#include "metrics/counter_metrics.h"

#include "os/log.h"

#include "os/reactor.h"

#include "os/thread.h"
@@ -157,6 +158,7 @@ class HciHalHost : public HciHal { 


 protected:

  void ListDependencies(ModuleList* list) const {

    list->add<metrics::CounterMetrics>();

    list->add<SnoopLogger>();

  }

system/gd/metrics/Android.bp

0 → 100644
+22 −0
Original line number Diff line number Diff line 
package {

    // See: http://go/android-license-faq

    // A large-scale-change added 'default_applicable_licenses' to import

    // all of the 'license_kinds' from "system_bt_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["system_bt_license"],

}



filegroup {

    name: "BluetoothMetricsSources",

    srcs: [

        "counter_metrics.cc",

    ],

}



filegroup {

    name: "BluetoothMetricsTestSources",

    srcs: [

        "counter_metrics_unittest.cc",

    ],

}