Merge "Use bluetooth-specific statslog" (719e790c) · Commits · e / os / android_packages_modules_Bluetooth

system/blueberry/tests/gd/cert/gd_device.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -244,7 +244,7 @@ class GdAndroidDevice(GdDeviceBase):
		self.push_or_die(os.path.join(get_gd_root(), "target", "libgrpc++_unsecure.so"), "system/lib64")
		self.push_or_die(os.path.join(get_gd_root(), "target", "libgrpc++.so"), "system/lib64")
		self.push_or_die(os.path.join(get_gd_root(), "target", "libgrpc_wrap.so"), "system/lib64")
		self.push_or_die(os.path.join(get_gd_root(), "target", "libstatslog.so"), "system/lib64")
		self.push_or_die(os.path.join(get_gd_root(), "target", "libstatslog_bt.so"), "system/lib64")

		try:
		self.adb.shell("rm /data/misc/bluetooth/logs/btsnoop_hci.log")

system/btcore/fuzzer/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@ cc_defaults {
		name: "btcore_fuzz_defaults",
		shared_libs: [
		"libcrypto",
		"libstatslog",
		"libstatslog_bt",
		"libbluetooth",
		"android.hardware.bluetooth@1.0",
		"android.hardware.bluetooth@1.1",

system/btif/Android.bp

+53 −9

Original line number	Diff line number	Diff line
		@@ -35,6 +35,58 @@ btifCommonIncludes = [
		"system/libhwbinder/include",
		]

		cc_library {
		name: "libstatslog_bt",
		host_supported: true,
		generated_sources: ["statslog_bt.cpp"],
		generated_headers: ["statslog_bt.h"],
		export_generated_headers: ["statslog_bt.h"],
		cflags: [
		"-Wall",
		"-Werror",
		],
		shared_libs: [
		"libcutils",
		],
		target: {
		android: {
		shared_libs: [
		"libstatssocket",
		],
		export_shared_lib_headers: [
		"libstatssocket",
		],
		},
		host: {
		static_libs: [
		"libstatssocket",
		],
		export_static_lib_headers: [
		"libstatssocket",
		],
		},
		darwin: {
		enabled: false,
		},
		},
		}

		genrule {
		name: "statslog_bt.h",
		tools: ["stats-log-api-gen"],
		cmd: "$(location stats-log-api-gen) --header $(genDir)/statslog_bt.h --module bluetooth"
		+ " --namespace bluetooth",
		out: ["statslog_bt.h"],
		}

		genrule {
		name: "statslog_bt.cpp",
		tools: ["stats-log-api-gen"],
		cmd: "$(location stats-log-api-gen) --cpp $(genDir)/statslog_bt.cpp --module bluetooth"
		+ " --namespace bluetooth --importHeader statslog_bt.h",
		out: ["statslog_bt.cpp"],
		}

		// libbtif static library for target
		cc_library_static {
		name: "libbtif",
		@@ -111,12 +163,9 @@ cc_library_static {
		"android.hardware.bluetooth.audio@2.0",
		"android.hardware.bluetooth.audio@2.1",
		"libcrypto",
		"libcutils",
		"libflatbuffers-cpp",
		"libhidlbase",
		"liblog",
		"libtinyxml2",
		"libutils",
		"libz",
		],
		target: {
		@@ -124,7 +173,7 @@ cc_library_static {
		shared_libs: [
		"libaaudio",
		"libfmq",
		"libstatslog",
		"libstatslog_bt",
		],
		srcs: ["src/btif_avrcp_audio_track.cc"],
		},
		@@ -165,11 +214,8 @@ cc_test {
		"libbinder_ndk",
		"libfmq",
		"libhidlbase",
		"liblog",
		"libprotobuf-cpp-lite",
		"libcutils",
		"libprocessgroup",
		"libutils",
		"libcrypto",
		],
		static_libs: [
		@@ -216,9 +262,7 @@ cc_test {
		"BluetoothGeneratedPackets_h",
		],
		shared_libs: [
		"libcutils",
		"libflatbuffers-cpp",
		"liblog",
		],
		static_libs: [
		"libbluetooth-types",

system/btif/src/btif_bqr.cc

+3 −3

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@
		#include <errno.h>
		#include <fcntl.h>
		#ifdef OS_ANDROID
		#include <statslog.h>
		#include <statslog_bt.h>
		#endif
		#include <stdio.h>
		#include <sys/stat.h>
		@@ -398,8 +398,8 @@ void AddLinkQualityEventToQueue(uint8_t length, uint8_t* p_link_quality_event) {
		p_bqr_event->bqr_link_quality_event_.nak_count);

		#ifdef OS_ANDROID
		int ret = android::util::stats_write(
		android::util::BLUETOOTH_QUALITY_REPORT_REPORTED,
		int ret = stats_write(
		BLUETOOTH_QUALITY_REPORT_REPORTED,
		p_bqr_event->bqr_link_quality_event_.quality_report_id,
		p_bqr_event->bqr_link_quality_event_.packet_types,
		p_bqr_event->bqr_link_quality_event_.connection_handle,

system/build/Android.bp

+2 −2

Original line number	Diff line number	Diff line
		@@ -109,7 +109,7 @@ fluoride_defaults {
		],
		target: {
		darwin: {
		// libstatslog -> libbinder doesn't build on mac
		// libstatslog_bt -> libbinder doesn't build on mac
		enabled: false,
		},
		android: {
		@@ -120,7 +120,7 @@ fluoride_defaults {
		"libgrpc++",
		"libgrpc_wrap",
		"libhidlbase",
		"libstatslog",
		"libstatslog_bt",
		"libutils",
		],
		cflags: [