Add host support for libbluetooth.so am: 0769e709f0 (de1d23ae) · Commits · e / os / android_packages_modules_Bluetooth

system/btif/Android.bp

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -118,9 +118,6 @@ cc_library_static {
	"libaaudio",		"libaaudio",
	"libfmq",		"libfmq",
	],		],
	whole_static_libs: [
	"libbt-audio-hal-interface",
	],
	srcs: ["src/btif_avrcp_audio_track.cc"],		srcs: ["src/btif_avrcp_audio_track.cc"],
	},		},
	host: {		host: {
	@@ -130,6 +127,7 @@ cc_library_static {
	whole_static_libs: [		whole_static_libs: [
	"avrcp-target-service",		"avrcp-target-service",
	"lib-bt-packets",		"lib-bt-packets",
			"libbt-audio-hal-interface",
	"libaudio-a2dp-hw-utils",		"libaudio-a2dp-hw-utils",
	],		],
	cflags: [		cflags: [

system/btif/src/btif_debug_btsnoop.cc

+16 −11

Original line number	Original line	Diff line number	Diff line
	@@ -35,12 +35,6 @@
	static const size_t BTSNOOP_MEM_BUFFER_SIZE = (256 * 1024);		static const size_t BTSNOOP_MEM_BUFFER_SIZE = (256 * 1024);
	#endif		#endif

	// Block size for copying buffers (for compression/encoding etc.)
	static const size_t BLOCK_SIZE = 16384;

	// Maximum line length in bugreport (should be multiple of 4 for base64 output)
	static const uint8_t MAX_LINE_LENGTH = 128;

	static std::mutex buffer_mutex;		static std::mutex buffer_mutex;
	static ringbuffer_t* buffer = NULL;		static ringbuffer_t* buffer = NULL;
	static uint64_t last_timestamp_ms = 0;		static uint64_t last_timestamp_ms = 0;
	@@ -134,6 +128,18 @@ static size_t btsnoop_calculate_packet_length(uint16_t type,
	}		}
	}		}

			void btif_debug_btsnoop_init(void) {
			if (buffer == NULL) buffer = ringbuffer_init(BTSNOOP_MEM_BUFFER_SIZE);
			btsnoop_mem_set_callback(btsnoop_cb);
			}

			#ifndef OS_ANDROID
			void btif_debug_btsnoop_dump(int fd) {}
			#else

			// Block size for copying buffers (for compression/encoding etc.)
			static constexpr size_t BLOCK_SIZE = 16384;

	static bool btsnoop_compress(ringbuffer_t* rb_dst, ringbuffer_t* rb_src) {		static bool btsnoop_compress(ringbuffer_t* rb_dst, ringbuffer_t* rb_src) {
	CHECK(rb_dst != NULL);		CHECK(rb_dst != NULL);
	CHECK(rb_src != NULL);		CHECK(rb_src != NULL);
	@@ -175,11 +181,6 @@ static bool btsnoop_compress(ringbuffer_t* rb_dst, ringbuffer_t* rb_src) {
	return rc;		return rc;
	}		}

	void btif_debug_btsnoop_init(void) {
	if (buffer == NULL) buffer = ringbuffer_init(BTSNOOP_MEM_BUFFER_SIZE);
	btsnoop_mem_set_callback(btsnoop_cb);
	}

	void btif_debug_btsnoop_dump(int fd) {		void btif_debug_btsnoop_dump(int fd) {
	ringbuffer_t* ringbuffer = ringbuffer_init(BTSNOOP_MEM_BUFFER_SIZE);		ringbuffer_t* ringbuffer = ringbuffer_init(BTSNOOP_MEM_BUFFER_SIZE);
	if (ringbuffer == NULL) {		if (ringbuffer == NULL) {
	@@ -219,6 +220,9 @@ void btif_debug_btsnoop_dump(int fd) {

	while (ringbuffer_size(ringbuffer) > 0) {		while (ringbuffer_size(ringbuffer) > 0) {
	size_t read = ringbuffer_pop(ringbuffer, b64_in, 3);		size_t read = ringbuffer_pop(ringbuffer, b64_in, 3);
			// Maximum line length in bugreport (should be multiple of 4 for base64
			// output)
			constexpr uint8_t MAX_LINE_LENGTH = 128;
	if (line_length >= MAX_LINE_LENGTH) {		if (line_length >= MAX_LINE_LENGTH) {
	dprintf(fd, "\n");		dprintf(fd, "\n");
	line_length = 0;		line_length = 0;
	@@ -232,3 +236,4 @@ void btif_debug_btsnoop_dump(int fd) {
	error:		error:
	ringbuffer_free(ringbuffer);		ringbuffer_free(ringbuffer);
	}		}
			#endif

system/gd/btaa/host/activity_attribution.cc

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -36,5 +36,7 @@ void ActivityAttribution::Start() {}

	void ActivityAttribution::Stop() {}		void ActivityAttribution::Stop() {}

			const ModuleFactory ActivityAttribution::Factory = ModuleFactory([]() { return new ActivityAttribution(); });

	} // namespace activity_attribution		} // namespace activity_attribution
	} // namespace bluetooth		} // namespace bluetooth

system/main/Android.bp

+15 −7

Original line number	Original line	Diff line number	Diff line
	@@ -99,14 +99,10 @@ cc_library_shared {
	"android.hardware.bluetooth.audio@2.1",		"android.hardware.bluetooth.audio@2.1",
	"android.hardware.bluetooth@1.0",		"android.hardware.bluetooth@1.0",
	"android.hardware.bluetooth@1.1",		"android.hardware.bluetooth@1.1",
	"android.system.suspend.control-V1-ndk",
	"libaaudio",
	"libbinder_ndk",		"libbinder_ndk",
	"libcrypto",		"libcrypto",
	"libcutils",		"libcutils",
	"libdl",
	"libflatbuffers-cpp",		"libflatbuffers-cpp",
	"libfmq",
	"libhidlbase",		"libhidlbase",
	"liblog",		"liblog",
	"libprocessgroup",		"libprocessgroup",
	@@ -137,6 +133,19 @@ cc_library_shared {
	"libosi",		"libosi",
	"libbt-protos-lite",		"libbt-protos-lite",
	],		],
			target: {
			android: {
			shared_libs: [
			"android.system.suspend.control-V1-ndk",
			"libaaudio",
			"libfmq",
			],
			required: [
			"libldacBT_enc",
			"libldacBT_abr",
			],
			},
			},
	// Shared library link options.		// Shared library link options.
	// References to global symbols and functions should bind to the library		// References to global symbols and functions should bind to the library
	// itself. This is to avoid issues with some of the unit/system tests		// itself. This is to avoid issues with some of the unit/system tests
	@@ -146,15 +155,14 @@ cc_library_shared {
	required: [		required: [
	"bt_did.conf",		"bt_did.conf",
	"bt_stack.conf",		"bt_stack.conf",
	"libldacBT_enc",
	"libldacBT_abr",
	],		],
	cflags: [		cflags: [
	"-DBUILDCFG",		"-DBUILDCFG",
	],		],
	sanitize: {		sanitize: {
	scs: true,		never: true,
	},		},
			host_supported: true,
	}		}

	cc_library_static {		cc_library_static {