Embed libbt-protos-lite into libbt-common (f65bc430) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/Android.bp

+0 −13

Original line number	Original line	Diff line number	Diff line
	@@ -237,7 +237,6 @@ cc_test {
	"libbt-bta",		"libbt-bta",
	"libbt-bta-core",		"libbt-bta-core",
	"libbt-common",		"libbt-common",
	"libbt-protos-lite",
	"libbtcore",		"libbtcore",
	"libchrome",		"libchrome",
	"libcom.android.sysprop.bluetooth",		"libcom.android.sysprop.bluetooth",
	@@ -283,7 +282,6 @@ cc_test {
	"libbt-bta",		"libbt-bta",
	"libbt-bta-core",		"libbt-bta-core",
	"libbt-common",		"libbt-common",
	"libbt-protos-lite",
	"libbtcore",		"libbtcore",
	"libchrome",		"libchrome",
	"libosi",		"libosi",
	@@ -398,7 +396,6 @@ cc_test {
	static_libs: [		static_libs: [
	"libbluetooth-types",		"libbluetooth-types",
	"libbt-common",		"libbt-common",
	"libbt-protos-lite",
	"libbtcore",		"libbtcore",
	"libbtdevice",		"libbtdevice",
	"libchrome",		"libchrome",
	@@ -460,7 +457,6 @@ cc_test {
	static_libs: [		static_libs: [
	"crypto_toolbox_for_tests",		"crypto_toolbox_for_tests",
	"libbt-common",		"libbt-common",
	"libbt-protos-lite",
	"libchrome",		"libchrome",
	"libgmock",		"libgmock",
	"libosi",		"libosi",
	@@ -504,7 +500,6 @@ cc_test {
	static_libs: [		static_libs: [
	"crypto_toolbox_for_tests",		"crypto_toolbox_for_tests",
	"libbt-common",		"libbt-common",
	"libbt-protos-lite",
	"libchrome",		"libchrome",
	"libgmock",		"libgmock",
	"libosi",		"libosi",
	@@ -559,7 +554,6 @@ cc_test {
	static_libs: [		static_libs: [
	"crypto_toolbox_for_tests",		"crypto_toolbox_for_tests",
	"libbt-common",		"libbt-common",
	"libbt-protos-lite",
	"libchrome",		"libchrome",
	"libgmock",		"libgmock",
	"libosi",		"libosi",
	@@ -723,7 +717,6 @@ cc_test {
	],		],
	static_libs: [		static_libs: [
	"libbt-common",		"libbt-common",
	"libbt-protos-lite",
	"libchrome",		"libchrome",
	"libevent",		"libevent",
	"libflatbuffers-cpp",		"libflatbuffers-cpp",
	@@ -795,7 +788,6 @@ cc_test {
	"crypto_toolbox_for_tests",		"crypto_toolbox_for_tests",
	"libbt-audio-hal-interface",		"libbt-audio-hal-interface",
	"libbt-common",		"libbt-common",
	"libbt-protos-lite",
	"libchrome",		"libchrome",
	"libevent",		"libevent",
	"libflatbuffers-cpp",		"libflatbuffers-cpp",
	@@ -858,7 +850,6 @@ cc_test {
	static_libs: [		static_libs: [
	"crypto_toolbox_for_tests",		"crypto_toolbox_for_tests",
	"libbt-common",		"libbt-common",
	"libbt-protos-lite",
	"libchrome",		"libchrome",
	"libgmock",		"libgmock",
	"libosi",		"libosi",
	@@ -911,7 +902,6 @@ cc_test {
	],		],
	static_libs: [		static_libs: [
	"libbt-common",		"libbt-common",
	"libbt-protos-lite",
	"libchrome",		"libchrome",
	"libgmock",		"libgmock",
	"liblc3",		"liblc3",
	@@ -975,7 +965,6 @@ cc_test {
	static_libs: [		static_libs: [
	"libbt-audio-hal-interface",		"libbt-audio-hal-interface",
	"libbt-common",		"libbt-common",
	"libbt-protos-lite",
	"libchrome",		"libchrome",
	"libevent",		"libevent",
	"libgmock",		"libgmock",
	@@ -1036,7 +1025,6 @@ cc_test {
	static_libs: [		static_libs: [
	"crypto_toolbox_for_tests",		"crypto_toolbox_for_tests",
	"libbt-common",		"libbt-common",
	"libbt-protos-lite",
	"libchrome",		"libchrome",
	"libgmock",		"libgmock",
	],		],
	@@ -1098,7 +1086,6 @@ cc_test {
	static_libs: [		static_libs: [
	"crypto_toolbox_for_tests",		"crypto_toolbox_for_tests",
	"libbt-common",		"libbt-common",
	"libbt-protos-lite",
	"libchrome",		"libchrome",
	"libcom.android.sysprop.bluetooth",		"libcom.android.sysprop.bluetooth",
	"libevent",		"libevent",

system/btif/Android.bp

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -286,7 +286,6 @@ cc_test {
	"libbt-bta-core",		"libbt-bta-core",
	"libbt-common",		"libbt-common",
	"libbt-hci",		"libbt-hci",
	"libbt-protos-lite",
	"libbt-sbc-decoder",		"libbt-sbc-decoder",
	"libbt-sbc-encoder",		"libbt-sbc-encoder",
	"libbt-stack",		"libbt-stack",
	@@ -413,7 +412,6 @@ cc_test {
	static_libs: [		static_libs: [
	"libbluetooth-types",		"libbluetooth-types",
	"libbt-common",		"libbt-common",
	"libbt-protos-lite",
	"libchrome",		"libchrome",
	"libevent",		"libevent",
	"libosi-AllocationTestHarness",		"libosi-AllocationTestHarness",

system/build/Android.bp

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -71,7 +71,6 @@ cc_defaults {
	],		],
	static_libs: [		static_libs: [
	"libbt-common",		"libbt-common",
	"libbt-protos-lite",
	"libcutils",		"libcutils",
	"libgmock",		"libgmock",
	"libosi",		"libosi",
	@@ -95,7 +94,6 @@ cc_defaults {
	"com.android.btservices",		"com.android.btservices",
	],		],
	static_libs: [		static_libs: [
	"libbt-protos-lite",
	"libflatbuffers-cpp",		"libflatbuffers-cpp",
	"libprotobuf-cpp-lite",		"libprotobuf-cpp-lite",
	],		],

system/common/Android.bp

+9 −2

Original line number	Original line	Diff line number	Diff line
	@@ -28,9 +28,17 @@ cc_library_static {
	"stop_watch_legacy.cc",		"stop_watch_legacy.cc",
	"time_util.cc",		"time_util.cc",
	],		],
			proto: {
			type: "lite",
			canonical_path_from_root: false,
			export_proto_headers: true,
			},
	target: {		target: {
	android: {		android: {
	srcs: ["metrics.cc"],		srcs: [
			":bluetooth-metrics-proto",
			"metrics.cc",
			],
	},		},
	host: {		host: {
	srcs: ["metrics_linux.cc"],		srcs: ["metrics_linux.cc"],
	@@ -85,7 +93,6 @@ cc_test {
	],		],
	static_libs: [		static_libs: [
	"libbt-common",		"libbt-common",
	"libbt-protos-lite",
	"libchrome",		"libchrome",
	"libevent",		"libevent",
	"libgmock",		"libgmock",

system/gd/proto/Android.bp

+2 −11

Original line number	Original line	Diff line number	Diff line
	@@ -23,20 +23,11 @@ java_library_static {
	sdk_version: "current",		sdk_version: "current",
	}		}

	cc_library_static {		filegroup {
	name: "libbt-protos-lite",		name: "bluetooth-metrics-proto",
	host_supported: true,
	proto: {
	export_proto_headers: true,
	type: "lite",
	},
	srcs: [		srcs: [
	"bluetooth/metrics/bluetooth.proto",		"bluetooth/metrics/bluetooth.proto",
	],		],
	apex_available: [
	"com.android.btservices",
	],
	min_sdk_version: "30",
	}		}

	cc_library_static {		cc_library_static {