Merge "Finalize enforcment of -s in bp" (c6797300) · Commits · e / os / android_packages_modules_Bluetooth

android/app/tests/unit/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -44,9 +44,9 @@ java_defaults {
		platform_apis: true,

		test_suites: [
		"automotive-tests",
		"device-tests",
		"mts-bluetooth",
		"automotive-tests",
		],

		instrumentation_for: "Bluetooth",

pandora/interfaces/python/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -19,9 +19,9 @@ genrule {
		"touch $(genDir)/pandora_experimental/py.typed &&" +
		"touch $(genDir)/pandora_experimental/__init__.py",
		srcs: [
		":libprotobuf-internal-protos",
		":pandora-protos",
		":pandora_experimental-protos",
		":libprotobuf-internal-protos",
		],
		out: [
		"pandora_experimental/__init__.py",

service/tests/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -32,8 +32,8 @@ android_test {
		static_libs: [
		"androidx.test.rules",
		"frameworks-base-testutils",
		"mockito-target-extended-minus-junit4",
		"kotlinx_coroutines_test",
		"mockito-target-extended-minus-junit4",
		"platform-compat-test-rules",
		"platform-test-annotations",
		"service-bluetooth.change-ids",

system/stack/Android.bp

+38 −38

Original line number	Diff line number	Diff line
		@@ -310,12 +310,12 @@ cc_defaults {
		name: "btstack_fuzzer_default",
		host_supported: true,
		cflags: [
		"-DHAS_NO_BDROID_BUILDCFG",
		"-Wall",
		"-Wextra",
		"-Werror",
		"-Wextra",
		// Mocked components have too many unused parameters
		"-Wno-unused-parameter",
		"-DHAS_NO_BDROID_BUILDCFG",
		],
		include_dirs: [
		"packages/modules/Bluetooth/system",
		@@ -365,12 +365,12 @@ cc_defaults {
		],
		componentid: 27441, // Android > Android OS & Apps > Systems > bluetooth
		hotlists: [
		"4810445", // ASA Red Team: Bluetooth Engagement Issues
		"3705175", // ASA Red Team Discovered Issues
		"4810445", // ASA Red Team: Bluetooth Engagement Issues
		],
		acknowledgement: [
		"Android Red Team of Google",
		"Android Bluetooth Team of Google",
		"Android Red Team of Google",
		],
		},
		}
		@@ -392,9 +392,9 @@ cc_fuzz {
		":TestMockBtif",
		":TestMockDevice",
		":TestMockGdOsLoggingLogRedaction",
		":TestMockStackBtm",
		":TestMockStackL2cap",
		":TestMockStackMetrics",
		":TestMockStackBtm",
		"fuzzers/sdp_fuzzer.cc",
		],
		}
		@@ -406,17 +406,15 @@ cc_fuzz {
		"fluoride_defaults_fuzzable",
		],
		include_dirs: [
		"packages/modules/Bluetooth/system/stack/btm",
		"external/flatbuffers/include",
		"external/rust/crates/quiche/deps/boringssl/src/include",
		"packages/modules/Bluetooth/system/stack/btm",
		],
		generated_headers: [
		"BluetoothGeneratedDumpsysDataSchema_h",
		"BluetoothGeneratedPackets_h",
		],
		srcs: crypto_toolbox_srcs + [
		"gatt/*.cc",
		"eatt/*.cc",
		":TestCommonLogMsg",
		":TestCommonMockFunctions",
		":TestCommonStackConfig",
		@@ -424,17 +422,19 @@ cc_fuzz {
		":TestMockBtif",
		":TestMockDevice",
		":TestMockGdOsLoggingLogRedaction",
		":TestMockMainShim",
		":TestMockRustFfi",
		":TestMockSrvcDis",
		":TestMockStackL2cap",
		":TestMockStackMetrics",
		":TestMockStackBtm",
		":TestMockStackAcl",
		":TestMockStackArbiter",
		":TestMockStackBtm",
		":TestMockStackHcic",
		":TestMockMainShim",
		":TestMockStackL2cap",
		":TestMockStackMetrics",
		":TestMockStackSdp",
		":TestMockStackArbiter",
		":TestMockRustFfi",
		"eatt/*.cc",
		"fuzzers/gatt_fuzzer.cc",
		"gatt/*.cc",
		],
		static_libs: [
		"libgmock",
		@@ -448,16 +448,15 @@ cc_fuzz {
		"fluoride_defaults_fuzzable",
		],
		include_dirs: [
		"packages/modules/Bluetooth/system/stack/btm",
		"external/flatbuffers/include",
		"external/rust/crates/quiche/deps/boringssl/src/include",
		"packages/modules/Bluetooth/system/stack/btm",
		],
		generated_headers: [
		"BluetoothGeneratedDumpsysDataSchema_h",
		"BluetoothGeneratedPackets_h",
		],
		srcs: crypto_toolbox_srcs + [
		"smp/smp_*.cc",
		":TestCommonLogMsg",
		":TestCommonMockFunctions",
		":TestCommonStackConfig",
		@@ -465,13 +464,14 @@ cc_fuzz {
		":TestMockBtif",
		":TestMockDevice",
		":TestMockGdOsLoggingLogRedaction",
		":TestMockStackL2cap",
		":TestMockStackMetrics",
		":TestMockStackBtm",
		":TestMockMainShim",
		":TestMockStackAcl",
		":TestMockStackBtm",
		":TestMockStackHcic",
		":TestMockMainShim",
		":TestMockStackL2cap",
		":TestMockStackMetrics",
		"fuzzers/smp_fuzzer.cc",
		"smp/smp_*.cc",
		],
		static_libs: [
		"libgmock",
		@@ -485,16 +485,15 @@ cc_fuzz {
		"fluoride_defaults_fuzzable",
		],
		include_dirs: [
		"packages/modules/Bluetooth/system/stack/btm",
		"external/flatbuffers/include",
		"external/rust/crates/quiche/deps/boringssl/src/include",
		"packages/modules/Bluetooth/system/stack/btm",
		],
		generated_headers: [
		"BluetoothGeneratedDumpsysDataSchema_h",
		"BluetoothGeneratedPackets_h",
		],
		srcs: [
		"bnep/*.cc",
		":TestCommonLogMsg",
		":TestCommonMockFunctions",
		":TestCommonStackConfig",
		@@ -502,12 +501,13 @@ cc_fuzz {
		":TestMockBtif",
		":TestMockDevice",
		":TestMockGdOsLoggingLogRedaction",
		":TestMockStackL2cap",
		":TestMockStackMetrics",
		":TestMockStackBtm",
		":TestMockMainShim",
		":TestMockStackAcl",
		":TestMockStackBtm",
		":TestMockStackHcic",
		":TestMockMainShim",
		":TestMockStackL2cap",
		":TestMockStackMetrics",
		"bnep/*.cc",
		"fuzzers/bnep_fuzzer.cc",
		],
		static_libs: [
		@@ -522,17 +522,15 @@ cc_fuzz {
		"fluoride_defaults_fuzzable",
		],
		include_dirs: [
		"packages/modules/Bluetooth/system/stack/btm",
		"external/flatbuffers/include",
		"external/rust/crates/quiche/deps/boringssl/src/include",
		"packages/modules/Bluetooth/system/stack/btm",
		],
		generated_headers: [
		"BluetoothGeneratedDumpsysDataSchema_h",
		"BluetoothGeneratedPackets_h",
		],
		srcs: [
		"avrc/*.cc",
		"avct/*.cc",
		":TestCommonLogMsg",
		":TestCommonMockFunctions",
		":TestCommonStackConfig",
		@@ -540,13 +538,15 @@ cc_fuzz {
		":TestMockBtif",
		":TestMockDevice",
		":TestMockGdOsLoggingLogRedaction",
		":TestMockStackL2cap",
		":TestMockStackMetrics",
		":TestMockStackBtm",
		":TestMockMainShim",
		":TestMockStackAcl",
		":TestMockStackBtm",
		":TestMockStackHcic",
		":TestMockMainShim",
		":TestMockStackL2cap",
		":TestMockStackMetrics",
		":TestMockStackSdp",
		"avct/*.cc",
		"avrc/*.cc",
		"fuzzers/avrc_fuzzer.cc",
		],
		static_libs: [
		@@ -569,16 +569,15 @@ cc_fuzz {
		"fluoride_defaults_fuzzable",
		],
		include_dirs: [
		"packages/modules/Bluetooth/system/stack/btm",
		"external/flatbuffers/include",
		"external/rust/crates/quiche/deps/boringssl/src/include",
		"packages/modules/Bluetooth/system/stack/btm",
		],
		generated_headers: [
		"BluetoothGeneratedDumpsysDataSchema_h",
		"BluetoothGeneratedPackets_h",
		],
		srcs: [
		"l2cap/*.cc",
		":TestCommonLogMsg",
		":TestCommonMockFunctions",
		":TestCommonStackConfig",
		@@ -586,12 +585,13 @@ cc_fuzz {
		":TestMockBtif",
		":TestMockDevice",
		":TestMockGdOsLoggingLogRedaction",
		":TestMockStackMetrics",
		":TestMockStackBtm",
		":TestMockMainShim",
		":TestMockStackAcl",
		":TestMockStackBtm",
		":TestMockStackHcic",
		":TestMockMainShim",
		":TestMockStackMetrics",
		"fuzzers/l2cap_fuzzer.cc",
		"l2cap/*.cc",
		],
		static_libs: [
		"libgmock",

tools/rootcanal/Android.bp

+3 −2

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ cc_defaults {
		tidy_checks: [
		"-*",
		"readability-*",

		"-readability-function-size",
		"-readability-identifier-length",
		"-readability-implicit-bool-conversion",
		@@ -39,11 +40,11 @@ cc_defaults {
		c_std: "c99",
		cpp_std: "c++17",
		cflags: [
		"-DGOOGLE_PROTOBUF_NO_RTTI",
		"-Wall",
		"-Werror",
		"-Wextra",
		"-fvisibility=hidden",
		"-DGOOGLE_PROTOBUF_NO_RTTI",
		],
		include_dirs: [
		"packages/modules/Bluetooth/system/gd",
		@@ -64,11 +65,11 @@ cc_defaults {
		filegroup {
		name: "lib_sources",
		srcs: [
		"lib/log.cc",
		"lib/crypto/crypto.cc",
		"lib/hci/address.cc",
		"lib/hci/class_of_device.cc",
		"lib/hci/pcap_filter.cc",
		"lib/log.cc",
		],
		}