Merge "Re-work flatbuffer build and bundler" (3961257b) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -184,7 +184,6 @@ cc_test {
		"packages/modules/Bluetooth/system/gd",
		],
		generated_headers: [
		"BluetoothGeneratedBundlerSchema_h_bfbs",
		"BluetoothGeneratedDumpsysDataSchema_h",
		"BluetoothGeneratedPackets_h",
		],

system/btif/Android.bp

+1 −4

Original line number	Diff line number	Diff line
		@@ -154,7 +154,6 @@ cc_library_static {
		"src/stack_manager.cc",
		],
		generated_headers: [
		"BluetoothGeneratedBundlerSchema_h_bfbs",
		"BluetoothGeneratedDumpsysDataSchema_h",
		"BluetoothGeneratedPackets_h",
		],
		@@ -241,6 +240,7 @@ cc_test {
		],
		whole_static_libs: [
		"libbtif",
		"libbluetooth-dumpsys",
		"libbluetooth-for-tests",
		],
		cflags: ["-DBUILDCFG"],
		@@ -261,7 +261,6 @@ cc_test {
		],
		header_libs: ["libbluetooth_headers"],
		generated_headers: [
		"BluetoothGeneratedBundlerSchema_h_bfbs",
		"BluetoothGeneratedDumpsysDataSchema_h",
		"BluetoothGeneratedPackets_h",
		],
		@@ -428,9 +427,7 @@ cc_test {
		"test/btif_core_test.cc",
		],
		generated_headers: [
		"BluetoothGeneratedBundlerSchema_h_bfbs",
		"BluetoothGeneratedDumpsysDataSchema_h",
		"BluetoothGeneratedDumpsysTestData_h",
		"BluetoothGeneratedPackets_h",
		],
		header_libs: ["libbluetooth_headers"],

system/gd/Android.bp

+5 −3

Original line number	Diff line number	Diff line
		@@ -178,7 +178,6 @@ cc_defaults {
		generated_headers: [
		"BluetoothGeneratedBundlerSchema_h_bfbs",
		"BluetoothGeneratedDumpsysDataSchema_h",
		"BluetoothGeneratedDumpsysBundledSchema_h",
		"BluetoothGeneratedPackets_h",
		],
		shared_libs: [
		@@ -189,6 +188,7 @@ cc_defaults {
		"libgrpc_wrap",
		],
		static_libs: [
		"libbluetooth-dumpsys",
		"libbluetooth-protos",
		"libbluetooth_rust_interop",
		"libbt-platform-protos-lite",
		@@ -250,6 +250,7 @@ cc_binary {
		],
		static_libs: [
		"breakpad_client",
		"libbluetooth-dumpsys",
		"libbluetooth-protos",
		"libbluetooth_gd",
		"libflatbuffers-cpp",
		@@ -347,13 +348,14 @@ cc_test {
		],
		generated_headers: [
		"BluetoothGeneratedBundlerSchema_h_bfbs",
		"BluetoothGeneratedDumpsysBundledSchema_h",
		"BluetoothGeneratedDumpsysBundledTestSchema_h",
		"BluetoothGeneratedDumpsysDataSchema_h",
		"BluetoothGeneratedDumpsysTestData_h",
		"BluetoothGeneratedPackets_h",
		],
		static_libs: [
		"libbluetooth-dumpsys",
		"libbluetooth-dumpsys-test",
		"libbluetooth-dumpsys-unittest",
		"libbluetooth-protos",
		"libbluetooth_gd",
		"libc++fs",

system/gd/BUILD.gn

+1 −1

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@ group("gd_default_deps") {
		deps = [
		"//bt/gd:BluetoothGeneratedDumpsysDataSchema_h",
		"//bt/gd:BluetoothGeneratedPackets_h",
		"//bt/gd/dumpsys:BluetoothGeneratedDumpsysBundledSchema_h",
		"//bt/gd/dumpsys:BluetoothGeneratedDumpsysBundledSchema_cc",
		"//bt/gd/rust/shim:init_flags_bridge_header",
		]
		}

system/gd/dumpsys/Android.bp

+60 −16

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ filegroup {

		genrule {
		name: "BluetoothGeneratedDumpsysTestData_h",
		visibility: ["//visibility:public"],
		tools: [
		"flatc",
		],
		@@ -50,6 +51,7 @@ genrule {

		genrule {
		name: "BluetoothGeneratedDumpsysTestData_bfbs",
		visibility: ["//visibility:private"],
		tools: [
		"flatc",
		],
		@@ -71,7 +73,8 @@ genrule {
		}

		genrule {
		name: "BluetoothGeneratedDumpsysTestSchema_h",
		name: "BluetoothGeneratedDumpsysTestSchema_cc",
		visibility: ["//visibility:private"],
		tools: [
		"bluetooth_flatbuffer_bundler",
		],
		@@ -80,12 +83,13 @@ genrule {
		":BluetoothGeneratedDumpsysBinarySchema_bfbs",
		],
		out: [
		"dumpsys_module_schema_data.h",
		"dumpsys_module_schema_data.cc",
		],
		}

		genrule {
		name: "BluetoothGeneratedDumpsysBundledSchema_h",
		name: "BluetoothGeneratedDumpsysBundledSchema_cc",
		visibility: ["//visibility:private"],
		tools: [
		"bluetooth_flatbuffer_bundler",
		],
		@@ -94,12 +98,13 @@ genrule {
		":BluetoothGeneratedDumpsysBinarySchema_bfbs",
		],
		out: [
		"generated_dumpsys_bundled_schema.h",
		"generated_dumpsys_bundled_schema.cc",
		],
		}

		genrule {
		name: "BluetoothGeneratedDumpsysBundledTestSchema_h",
		name: "BluetoothGeneratedDumpsysBundledTestSchema_cc",
		visibility: ["//visibility:private"],
		tools: [
		"bluetooth_flatbuffer_bundler",
		],
		@@ -108,7 +113,7 @@ genrule {
		":BluetoothGeneratedDumpsysTestData_bfbs",
		],
		out: [
		"generated_dumpsys_bundled_test_schema.h",
		"generated_dumpsys_bundled_test_schema.cc",
		],
		}

		@@ -126,6 +131,45 @@ genrule {
		],
		}

		cc_library {
		name: "libbluetooth-dumpsys",
		host_supported: true,
		defaults: [
		"gd_defaults",
		"gd_clang_file_coverage",
		"gd_clang_tidy",
		],
		generated_sources: [
		"BluetoothGeneratedDumpsysBundledSchema_cc",
		],
		}

		cc_library {
		name: "libbluetooth-dumpsys-test",
		host_supported: true,
		defaults: [
		"gd_defaults",
		"gd_clang_file_coverage",
		"gd_clang_tidy",
		],
		generated_sources: [
		"BluetoothGeneratedDumpsysBundledTestSchema_cc",
		],
		}

		cc_library {
		name: "libbluetooth-dumpsys-unittest",
		host_supported: true,
		defaults: [
		"gd_defaults",
		"gd_clang_file_coverage",
		"gd_clang_tidy",
		],
		generated_headers: [
		"BluetoothGeneratedDumpsysTestSchema_cc",
		],
		}

		cc_test {
		name: "bluetooth_flatbuffer_tests",
		test_suites: ["device-tests"],