Merge "Floss: use MMC as default" into main (7dd0a4e1) · Commits · e / os / android_packages_modules_Bluetooth

system/stack/BUILD.gn

+3 −14

Original line number	Diff line number	Diff line
		@@ -126,6 +126,8 @@ source_set("stack") {
		"btm/btm_sco_hci.cc",
		"btm/btm_sco_hfp_hal_linux.cc",
		"btm/btm_sec.cc",
		"btm/hfp_lc3_encoder_linux.cc",
		"btm/hfp_lc3_decoder_linux.cc",
		"btm/hfp_msbc_encoder.cc",
		"btm/hfp_msbc_decoder.cc",
		"btu/btu_event.cc",
		@@ -230,6 +232,7 @@ source_set("stack") {
		":nonstandard_codecs",
		"//bt/system:libbt-platform-protos-lite",
		"//bt/system/gd/rust/shim:init_flags_bridge_header",
		"//bt/system/stack/mmc",
		"//bt/system/types",
		"//bt/system/types",
		]
		@@ -237,20 +240,6 @@ source_set("stack") {
		configs += [
		"//bt/system:target_defaults",
		]

		if (defined(use.floss_mmc) && use.floss_mmc) {
		sources += [
		"btm/hfp_lc3_encoder_linux.cc",
		"btm/hfp_lc3_decoder_linux.cc",
		]
		deps += [ "//bt/system/stack/mmc" ]
		} else {
		sources += [
		"btm/hfp_lc3_encoder.cc",
		"btm/hfp_lc3_decoder.cc",
		]
		libs = [ "lc3" ]
		}
		}

		if (use.test) {

+6 −0

Original line number	Diff line number	Diff line
		@@ -107,11 +107,13 @@ if (use.test) {
		"codec_server/hfp_lc3_mmc_encoder.cc",
		"test/hfp_lc3_mmc_encoder_test.cc",
		"test/mock/mock_embdrv_lc3.cc",
		"//bt/system/test/mock/mock_common_address_obfuscator.cc",
		"//bt/system/test/mock/mock_osi_allocator.cc",
		"//bt/system/test/common/mock_functions.cc",
		]
		include_dirs = [
		"//bt/system/gd",
		"//bt/system/types",
		]
		configs += [
		":target_defaults",
		@@ -121,6 +123,7 @@ if (use.test) {
		"//bt/system/stack/mmc/proto:mmc_config_proto",
		"//bt/system/common",
		"//bt/system/osi",
		"//bt/system/types",
		]
		}

		@@ -129,11 +132,13 @@ if (use.test) {
		"codec_server/hfp_lc3_mmc_decoder.cc",
		"test/hfp_lc3_mmc_decoder_test.cc",
		"test/mock/mock_embdrv_lc3.cc",
		"//bt/system/test/mock/mock_common_address_obfuscator.cc",
		"//bt/system/test/mock/mock_osi_allocator.cc",
		"//bt/system/test/common/mock_functions.cc",
		]
		include_dirs = [
		"//bt/system/gd",
		"//bt/system/types",
		]
		configs += [
		":target_defaults",
		@@ -143,6 +148,7 @@ if (use.test) {
		"//bt/system/stack/mmc/proto:mmc_config_proto",
		"//bt/system/common",
		"//bt/system/osi",
		"//bt/system/types",
		]
		}
		}