Merge "RootCanal: Remove usage of a cc_object for devices" (fb71a66a) · Commits · e / os / android_packages_modules_Bluetooth

system/test/rootcanal/Android.bp

+6 −2

Original line number	Original line	Diff line number	Diff line
	@@ -57,10 +57,12 @@ cc_binary {
	"BluetoothGeneratedPackets_h",		"BluetoothGeneratedPackets_h",
	"libbt_init_flags_bridge_header",		"libbt_init_flags_bridge_header",
	],		],
			whole_static_libs: [
			"libbt-rootcanal",
			],
	static_libs: [		static_libs: [
	"android.hardware.bluetooth-async",		"android.hardware.bluetooth-async",
	"android.hardware.bluetooth-hci",		"android.hardware.bluetooth-hci",
	"libbt-rootcanal",
	"libscriptedbeaconpayload-protos-lite",		"libscriptedbeaconpayload-protos-lite",
	],		],
	include_dirs: [		include_dirs: [
	@@ -106,10 +108,12 @@ cc_library_shared {
	"BluetoothGeneratedPackets_h",		"BluetoothGeneratedPackets_h",
	"libbt_init_flags_bridge_header",		"libbt_init_flags_bridge_header",
	],		],
			whole_static_libs: [
			"libbt-rootcanal"
			],
	static_libs: [		static_libs: [
	"android.hardware.bluetooth-async",		"android.hardware.bluetooth-async",
	"android.hardware.bluetooth-hci",		"android.hardware.bluetooth-hci",
	"libbt-rootcanal",
	"libscriptedbeaconpayload-protos-lite",		"libscriptedbeaconpayload-protos-lite",
	],		],
	include_dirs: [		include_dirs: [

tools/rootcanal/Android.bp

+17 −27

Original line number	Original line	Diff line number	Diff line
	@@ -39,31 +39,9 @@ cc_defaults {
	],		],
	}		}

	// Compile devices and device boutique into a single object to force the linker		// This library should be added as `whole_static_libs`
	// to pick all the symbols for static registration to work		// as it uses static registration and all object
	cc_object {		// files needs to be linked
	name: "libbt-rootcanal-devices",
	defaults: ["rootcanal_defaults"],
	host_supported: true,
	proprietary: true,
	cflags: ["-fPIC"],
	srcs: [
	"model/devices/beacon.cc",
	"model/devices/beacon_swarm.cc",
	"model/devices/broken_adv.cc",
	"model/devices/car_kit.cc",
	"model/devices/classic.cc",
	"model/devices/keyboard.cc",
	"model/devices/loopback.cc",
	"model/devices/scripted_beacon.cc",
	"model/devices/sniffer.cc",
	"model/setup/device_boutique.cc",
	],
	static_libs: [
	"libscriptedbeaconpayload-protos-lite",
	]
	}

	cc_library_static {		cc_library_static {
	name: "libbt-rootcanal",		name: "libbt-rootcanal",
	defaults: ["rootcanal_defaults"],		defaults: ["rootcanal_defaults"],
	@@ -78,17 +56,27 @@ cc_library_static {
	"model/controller/link_layer_controller.cc",		"model/controller/link_layer_controller.cc",
	"model/controller/sco_connection.cc",		"model/controller/sco_connection.cc",
	"model/controller/security_manager.cc",		"model/controller/security_manager.cc",
			"model/devices/beacon.cc",
			"model/devices/beacon_swarm.cc",
			"model/devices/broken_adv.cc",
			"model/devices/car_kit.cc",
			"model/devices/classic.cc",
	"model/devices/device.cc",		"model/devices/device.cc",
	"model/devices/device_properties.cc",		"model/devices/device_properties.cc",
	"model/devices/hci_device.cc",		"model/devices/hci_device.cc",
			"model/devices/keyboard.cc",
	"model/devices/link_layer_socket_device.cc",		"model/devices/link_layer_socket_device.cc",
			"model/devices/loopback.cc",
	"model/devices/remote_loopback_device.cc",		"model/devices/remote_loopback_device.cc",
			"model/devices/scripted_beacon.cc",
			"model/devices/sniffer.cc",
	"model/hci/h4_data_channel_packetizer.cc",		"model/hci/h4_data_channel_packetizer.cc",
	"model/hci/h4_packetizer.cc",		"model/hci/h4_packetizer.cc",
	"model/hci/h4_parser.cc",		"model/hci/h4_parser.cc",
	"model/hci/hci_protocol.cc",		"model/hci/hci_protocol.cc",
	"model/hci/hci_socket_transport.cc",		"model/hci/hci_socket_transport.cc",
	"model/setup/async_manager.cc",		"model/setup/async_manager.cc",
			"model/setup/device_boutique.cc",
	"model/setup/phy_layer_factory.cc",		"model/setup/phy_layer_factory.cc",
	"model/setup/test_channel_transport.cc",		"model/setup/test_channel_transport.cc",
	"model/setup/test_command_handler.cc",		"model/setup/test_command_handler.cc",
	@@ -99,7 +87,6 @@ cc_library_static {
	":BluetoothPacketSources",		":BluetoothPacketSources",
	":BluetoothHciClassSources",		":BluetoothHciClassSources",
	":BluetoothCryptoToolboxSources",		":BluetoothCryptoToolboxSources",
	":libbt-rootcanal-devices",
	],		],
	export_include_dirs: [		export_include_dirs: [
	"include",		"include",
	@@ -110,6 +97,7 @@ cc_library_static {
	],		],
	static_libs: [		static_libs: [
	"libjsoncpp",		"libjsoncpp",
			"libscriptedbeaconpayload-protos-lite",
	],		],
	}		}

	@@ -182,11 +170,13 @@ cc_binary_host {
	"liblog",		"liblog",
	"libbacktrace",		"libbacktrace",
	],		],
			whole_static_libs: [
			"libbt-rootcanal",
			],
	static_libs: [		static_libs: [
	"libjsoncpp",		"libjsoncpp",
	"libprotobuf-cpp-lite",		"libprotobuf-cpp-lite",
	"libscriptedbeaconpayload-protos-lite",		"libscriptedbeaconpayload-protos-lite",
	"libbt-rootcanal",
	"breakpad_client",		"breakpad_client",
	"libgflags",		"libgflags",
	],		],