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

Commit 0d6a9af3 authored Mar 31, 2021 by Chen Chen Committed by Jack He Apr 13, 2021

GD metrics: Logging link layer events from GD

Events include:
* LinkLayerConnection,
* ReadRssi,
* ReadFailedContactCounter,
* ReadTxPower,
* RemoteVersionInfo,
* HciTimeout
Also move the gd metrics logging from common to os

Test: gd/cert/run
Manual test: build and run Bluetooth (connection, pairing, music and phone
call)
Bug: 181819141
Tag: #gd-refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: Id84651a4cc0343ed0438083290b3aaab1ead6535

parent 7f0f9b47

system/gd/Android.bp

+3 −6

Original line number	Diff line number	Diff line
		@@ -145,9 +145,6 @@ cc_defaults {
		"libutils",
		"libstatslog",
		],
		static_libs: [
		"libbt-platform-protos-lite",
		],
		},
		},
		srcs: [
		@@ -179,7 +176,6 @@ cc_defaults {
		"libflatbuffers-cpp",
		"libgrpc++",
		"libgrpc_wrap",
		"libstatslog",
		],
		static_libs: [
		"libbluetooth-protos",
		@@ -267,6 +263,7 @@ cc_binary {
		"libhidlbase",
		"libutils",
		"libcutils",
		"libstatslog",
		],
		},
		host: {
		@@ -317,6 +314,7 @@ cc_test {
		"libhidlbase",
		"libutils",
		"libcutils",
		"libstatslog",
		],
		},
		},
		@@ -389,12 +387,10 @@ cc_test {
		},
		static_libs: [
		"libchrome",
		"libbt-platform-protos-lite",
		],
		shared_libs: [
		"libgrpc++",
		"libgrpc_wrap",
		"libstatslog",
		],
		target: {
		android: {
		@@ -448,6 +444,7 @@ cc_defaults {
		"libcutils",
		"libhidlbase",
		"libutils",
		"libstatslog",
		],
		},
		},

system/gd/common/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,6 @@ filegroup {
		"metric_id_manager.cc",
		"strings.cc",
		"stop_watch.cc",
		"metrics.cc",
		],
		}

system/gd/common/BUILD.gn

+0 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@ source_set("BluetoothCommonSources") {
		sources = [
		"init_flags.cc",
		"metric_id_manager.cc"
		"metrics_linux.cc",
		"stop_watch.cc",
		"strings.cc",
		]

system/gd/hci/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ filegroup {
		"class_of_device.cc",
		"controller.cc",
		"hci_layer.cc",
		"hci_metrics_logging.cc",
		"le_address_manager.cc",
		"le_advertising_manager.cc",
		"le_scanning_manager.cc",

system/gd/hci/BUILD.gn

+1 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ source_set("BluetoothHciSources") {
		"class_of_device.cc",
		"controller.cc",
		"hci_layer.cc",
		"hci_metrics_logging.cc",
		"le_address_manager.cc",
		"le_advertising_manager.cc",
		"le_scanning_manager.cc",