Merge "Additional changes for Linux build" (4794dc40) · Commits · e / os / android_packages_modules_Bluetooth

BUILD.gn

+4 −2

Original line number	Diff line number	Diff line
		@@ -104,7 +104,9 @@ config("target_defaults") {
		"-Wno-final-dtor-non-final-class",
		]

		cflags_cc = [ "-std=c++17" ]
		cflags_cc = [
		"-std=c++17",
		]

		defines = [
		"HAS_NO_BDROID_BUILDCFG",
		@@ -116,7 +118,7 @@ config("target_defaults") {

		# If not configured as a dynamic library, default to static library
		if (!(defined(use.bt_dynlib) && use.bt_dynlib)) {
		defines = [
		defines += [
		"STATIC_LIBBLUETOOTH",
		]
		}

build.py

+44 −7

Original line number	Diff line number	Diff line
		@@ -61,11 +61,21 @@ VALID_TARGETS = [
		'tools', # Build the host tools (i.e. packetgen)
		'rust', # Build only the rust components + copy artifacts to output dir
		'main', # Build the main C++ codebase
		'test', # Build and run the unit tests
		'test', # Run the unit tests
		'clean', # Clean up output directory
		'all', # All targets except test and clean
		]

		HOST_TESTS = [
		'bluetooth_test_common',
		'bluetoothtbd_test',
		'net_test_avrcp',
		'net_test_btcore',
		'net_test_types',
		'net_test_btm_iso',
		'net_test_btpackets',
		]


		class UseFlags():

		@@ -110,6 +120,7 @@ class HostBuild():
		self.jobs = self.args.jobs
		if not self.jobs:
		self.jobs = multiprocessing.cpu_count()
		print("Number of jobs = {}".format(self.jobs))

		# Normalize all directories
		self.output_dir = os.path.abspath(self.args.output)
		@@ -123,7 +134,13 @@ class HostBuild():
		if hasattr(self.args, 'target') and self.args.target:
		self.target = self.args.target

		self.use = UseFlags(self.args.use if self.args.use else [])
		target_use = self.args.use if self.args.use else []

		# Unless set, always build test code
		if not self.args.notest:
		target_use.append('test')

		self.use = UseFlags(target_use)

		# Validate platform directory
		assert os.path.isdir(self.platform_dir), 'Platform dir does not exist'
		@@ -137,6 +154,18 @@ class HostBuild():

		self.configure_environ()

		def _generate_rustflags(self):
		""" Rustflags to include for the build.
		"""
		rust_flags = [
		'-L',
		'{}/out/Default/'.format(self.output_dir),
		'-C',
		'link-arg=-Wl,--allow-multiple-definition',
		]

		return ' '.join(rust_flags)

		def configure_environ(self):
		""" Configure environment variables for GN and Cargo.
		"""
		@@ -150,6 +179,7 @@ class HostBuild():
		# Configure Rust env variables
		self.env['CARGO_TARGET_DIR'] = self.output_dir
		self.env['CARGO_HOME'] = os.path.join(self.output_dir, 'cargo_home')
		self.env['RUSTFLAGS'] = self._generate_rustflags()

		# Configure some GN variables
		if self.use_board:
		@@ -364,7 +394,15 @@ class HostBuild():
		def _target_test(self):
		""" Runs the host tests.
		"""
		raise Exception('Not yet implemented')
		# Rust tests first
		self.run_command('test', ['cargo', 'test'], cwd=os.path.join(self.platform_dir, 'bt'), env=self.env)

		# Host tests second based on host test list
		for t in HOST_TESTS:
		self.run_command(
		'test', [os.path.join(self.output_dir, 'out/Default', t)],
		cwd=os.path.join(self.output_dir),
		env=self.env)

		def _target_clean(self):
		""" Delete the output directory entirely.
		@@ -393,8 +431,6 @@ class HostBuild():
		elif self.target == 'main':
		self._target_main()
		elif self.target == 'test':
		self.use.set_flag('test')
		self._target_all()
		self._target_test()
		elif self.target == 'clean':
		self._target_clean()
		@@ -406,14 +442,15 @@ if __name__ == '__main__':
		parser = argparse.ArgumentParser(description='Simple build for host.')
		parser.add_argument('--output', help='Output directory for the build.', required=True)
		parser.add_argument('--platform-dir', help='Directory where platform2 is staged.', required=True)
		parser.add_argument('--clang', help='Use clang compiler.', default=False, action="store_true")
		parser.add_argument('--clang', help='Use clang compiler.', default=False, action='store_true')
		parser.add_argument('--use', help='Set a specific use flag.')
		parser.add_argument('--notest', help="Don't compile test code.", default=False, action='store_true')
		parser.add_argument('--target', help='Run specific build target')
		parser.add_argument('--sysroot', help='Set a specific sysroot path', default='/')
		parser.add_argument('--libdir', help='Libdir - default = usr/lib64', default='usr/lib64')
		parser.add_argument('--use-board', help='Use a built x86 board for dependencies. Provide path.')
		parser.add_argument('--jobs', help='Number of jobs to run', default=0, type=int)
		parser.add_argument('--vendored-rust', help='Use vendored rust crates', default=False, action="store_true")
		parser.add_argument('--vendored-rust', help='Use vendored rust crates', default=False, action='store_true')
		parser.add_argument('--verbose', help='Verbose logs for build.')

		args = parser.parse_args()

system/btif/src/btif_bqr.cc

+6 −0

Original line number	Diff line number	Diff line
		@@ -17,7 +17,9 @@
		#include <base/logging.h>
		#include <errno.h>
		#include <fcntl.h>
		#ifdef OS_ANDROID
		#include <statslog.h>
		#endif
		#include <stdio.h>
		#include <sys/stat.h>

		@@ -395,6 +397,7 @@ void AddLinkQualityEventToQueue(uint8_t length, uint8_t* p_link_quality_event) {
		p_bqr_event->bqr_link_quality_event_.no_rx_count,
		p_bqr_event->bqr_link_quality_event_.nak_count);

		#ifdef OS_ANDROID
		int ret = android::util::stats_write(
		android::util::BLUETOOTH_QUALITY_REPORT_REPORTED,
		p_bqr_event->bqr_link_quality_event_.quality_report_id,
		@@ -420,6 +423,9 @@ void AddLinkQualityEventToQueue(uint8_t length, uint8_t* p_link_quality_event) {
		LOG(WARNING) << __func__ << ": failed to log BQR event to statsd, error "
		<< ret;
		}
		#else
		// TODO(abps) Metrics for non-Android build
		#endif
		kpBqrEventQueue->Enqueue(p_bqr_event.release());
		}

system/gd/BUILD.gn

+1 −1

Original line number	Diff line number	Diff line
		@@ -67,7 +67,7 @@ static_library("libbluetooth_gd") {
		"//bt/gd/crypto_toolbox:BluetoothCryptoToolboxSources",
		"//bt/gd/dumpsys:BluetoothDumpsysSources",
		"//bt/gd/hal:BluetoothHalSources",
		"//bt/gd/hal:BluetoothHalSources_hci_rootcanal",
		"//bt/gd/hal:BluetoothHalSources_hci_host",
		"//bt/gd/l2cap:BluetoothL2capSources",
		"//bt/gd/neighbor:BluetoothNeighborSources",
		"//bt/gd/rust/shim:libbluetooth_rust_interop",

system/gd/common/BUILD.gn

+2 −2

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@
		source_set("BluetoothCommonSources") {
		sources = [
		"init_flags.cc",
		"metric_id_manager.cc"
		"metric_id_manager.cc",
		"stop_watch.cc",
		"strings.cc",
		]
		@@ -25,6 +25,6 @@ source_set("BluetoothCommonSources") {
		configs += [ "//bt/gd:gd_defaults" ]
		deps = [
		"//bt/gd:gd_default_deps",
		"//bt/third_party/proto_logging/stats:libbt-platform-protos"
		"//bt:libbt-platform-protos-lite",
		]
		}