Various small warning/build fixes for Linux (e4e2f640) · Commits · e / os / android_packages_modules_Bluetooth

system/stack/BUILD.gn

+31 −1

Original line number	Diff line number	Diff line
		@@ -175,7 +175,6 @@ static_library("stack") {
		executable("stack_unittests") {
		testonly = true
		sources = [
		"test/ble_advertiser_test.cc",
		"test/stack_a2dp_test.cc",
		]

		@@ -219,3 +218,34 @@ executable("stack_unittests") {
		]
		}

		executable("net_test_stack_multi_adv") {
		testonly = true
		sources = [
		"btm/btm_ble_multi_adv.cc",
		"test/ble_advertiser_test.cc",
		]

		include_dirs = [
		"include",
		"//",
		"//btcore/include",
		"//hci/include",
		"//include",
		"//stack/btm",
		]

		libs = [
		"-ldl",
		"-lpthread",
		"-lresolv",
		"-lrt",
		"-lz",
		"-latomic",
		]

		deps = [
		"//third_party/googletest:gmock_main",
		"//third_party/libchrome:base",
		]
		}

+3 −3

Original line number	Diff line number	Diff line
		@@ -122,7 +122,7 @@ class BleAdvertiserHciInterfaceImpl : public BleAdvertiserHciInterface {

		void SetScanResponseData(uint8_t scan_response_data_length,
		uint8_t *scan_response_data, uint8_t inst_id,
		status_cb command_complete) {
		status_cb command_complete) override {
		VLOG(1) << __func__;
		uint8_t param[BTM_BLE_MULTI_ADV_WRITE_DATA_LEN];
		memset(param, 0, BTM_BLE_MULTI_ADV_WRITE_DATA_LEN);
		@@ -138,7 +138,7 @@ class BleAdvertiserHciInterfaceImpl : public BleAdvertiserHciInterface {
		}

		void SetRandomAddress(uint8_t random_address[6], uint8_t inst_id,
		status_cb command_complete) {
		status_cb command_complete) override {
		VLOG(1) << __func__;
		uint8_t param[BTM_BLE_MULTI_ADV_SET_RANDOM_ADDR_LEN];
		memset(param, 0, BTM_BLE_MULTI_ADV_SET_RANDOM_ADDR_LEN);
		@@ -153,7 +153,7 @@ class BleAdvertiserHciInterfaceImpl : public BleAdvertiserHciInterface {
		}

		void Enable(uint8_t advertising_enable, uint8_t inst_id,
		status_cb command_complete) {
		status_cb command_complete) override {
		VLOG(1) << __func__;
		uint8_t param[BTM_BLE_MULTI_ADV_ENB_LEN];
		memset(param, 0, BTM_BLE_MULTI_ADV_ENB_LEN);

+1 −1

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@ class BleAdvertiserHciInterface {
		virtual ~AdvertisingEventObserver() = default;
		virtual void OnAdvertisingStateChanged(uint8_t inst_id,
		uint8_t state_change_reason,
		uint16_t connection_handle);
		uint16_t connection_handle) = 0;
		};

		virtual void ReadInstanceCount(base::Callback<void(uint8_t /* inst_cnt*/)> cb) = 0;

+5 −5

Original line number	Diff line number	Diff line
		@@ -68,25 +68,25 @@ class BleAdvertisingManager {
		* advertising is disabled by calling \|BTM_BleDisableAdvInstance\|, or when any
		* of the operations fails. */
		virtual void RegisterAdvertiser(
		base::Callback<void(uint8_t /* inst_id /, uint8_t / status */)>);
		base::Callback<void(uint8_t /* inst_id /, uint8_t / status */)>) = 0;

		/* This function enables/disables an advertising instance. Operation status is
		* returned in \|cb\| */
		virtual void Enable(uint8_t inst_id, bool enable, MultiAdvCb cb, int timeout_s,
		MultiAdvCb timeout_cb);
		MultiAdvCb timeout_cb) = 0;

		/* This function update a Multi-ADV instance with the specififed adv
		* parameters. */
		virtual void SetParameters(uint8_t inst_id, tBTM_BLE_ADV_PARAMS *p_params,
		MultiAdvCb cb);
		MultiAdvCb cb) = 0;

		/* This function configure a Multi-ADV instance with the specified adv data or
		* scan response data.*/
		virtual void SetData(uint8_t inst_id, bool is_scan_rsp,
		std::vector<uint8_t> data, MultiAdvCb cb);
		std::vector<uint8_t> data, MultiAdvCb cb) = 0;

		/* This function disable a Multi-ADV instance */
		virtual void Unregister(uint8_t inst_id);
		virtual void Unregister(uint8_t inst_id) = 0;
		};

		#endif // BLE_ADVERTISER_H

+4 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,10 @@
		#include "stack/include/a2dp_sbc.h"
		#include "stack/include/a2dp_vendor.h"

		//TODO(jpawlowski): remove once weird dependency in hci_layer.cc is removed
		#include <hardware/bluetooth.h>
		bt_bdaddr_t btif_local_bd_addr;

		namespace {
		const uint8_t codec_info_sbc[AVDT_CODEC_SIZE] = {
		6, // Length (A2DP_SBC_INFO_LEN)