Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d55df64 authored by Abhishek Pandit-Subedi's avatar Abhishek Pandit-Subedi Committed by Android (Google) Code Review
Browse files

Merge "floss: build: Add btm_ble_scanner and remove leaudio"

parents 7e2b52b4 7c6257c8

system/bta/BUILD.gn

+5 −4
Original line number Diff line number Diff line
@@ -53,10 +53,11 @@ static_library("bta") { 
    "gatt/database.cc",

    "gatt/database_builder.cc",

    "groups/groups.cc",

    "has/has_client.cc",

    "has/has_ctp.cc",

    "has/has_preset.cc",

    "has/has_types.cc",

    # TODO(abps) - Enable with long-term effort for LE Audio

    #"has/has_client.cc",

    #"has/has_ctp.cc",

    #"has/has_preset.cc",

    #"has/has_types.cc",

    "hearing_aid/hearing_aid.cc",

    "hearing_aid/hearing_aid_audio_source.cc",

    "hf_client/bta_hf_client_act.cc",

system/btif/BUILD.gn

+2 −2
Original line number Diff line number Diff line
@@ -62,8 +62,8 @@ static_library("btif") { 
    "src/btif_gatt_util.cc",

    "src/btif_hd.cc",

    "src/btif_vc.cc",

    "src/btif_le_audio_broadcaster.cc",

    "src/btif_has_client.cc",

    #"src/btif_le_audio_broadcaster.cc",

    #"src/btif_has_client.cc",

    "src/btif_hearing_aid.cc",

    "src/btif_hf.cc",

    "src/btif_hf_client.cc",

system/btif/src/bluetooth.cc

+10 −0
Original line number Diff line number Diff line
@@ -92,8 +92,10 @@ 
using bluetooth::csis::CsisClientInterface;

using bluetooth::has::HasClientInterface;

using bluetooth::hearing_aid::HearingAidInterface;

#ifndef TARGET_FLOSS

using bluetooth::le_audio::LeAudioBroadcasterInterface;

using bluetooth::le_audio::LeAudioClientInterface;

#endif

using bluetooth::vc::VolumeControlInterface;



/*******************************************************************************
@@ -136,12 +138,14 @@ extern const btrc_ctrl_interface_t* btif_rc_ctrl_get_interface(); 
extern const btsdp_interface_t* btif_sdp_get_interface();

/*Hearing Aid client*/

extern HearingAidInterface* btif_hearing_aid_get_interface();

#ifndef TARGET_FLOSS

/* Hearing Access client */

extern HasClientInterface* btif_has_client_get_interface();

/* LeAudio testi client */

extern LeAudioClientInterface* btif_le_audio_get_interface();

/* LeAudio Broadcaster */

extern LeAudioBroadcasterInterface* btif_le_audio_broadcaster_get_interface();

#endif

/* Coordinated Set Service Client */

extern CsisClientInterface* btif_csis_client_get_interface();

/* Volume Control client */
@@ -421,10 +425,14 @@ static void dump(int fd, const char** arguments) { 
  osi_allocator_debug_dump(fd);

  alarm_debug_dump(fd);

  bluetooth::csis::CsisClient::DebugDump(fd);

#ifndef TARGET_FLOSS

  le_audio::has::HasClient::DebugDump(fd);

#endif

  HearingAid::DebugDump(fd);

#ifndef TARGET_FLOSS

  LeAudioClient::DebugDump(fd);

  LeAudioBroadcaster::DebugDump(fd);

#endif

  connection_manager::dump(fd);

  bluetooth::bqr::DebugDump(fd);

  bluetooth::shim::Dump(fd, arguments);
@@ -490,11 +498,13 @@ static const void* get_profile_interface(const char* profile_id) { 
    return bluetooth::activity_attribution::get_activity_attribution_instance();

  }



#ifndef TARGET_FLOSS

  if (is_profile(profile_id, BT_PROFILE_LE_AUDIO_ID))

    return btif_le_audio_get_interface();



  if (is_profile(profile_id, BT_PROFILE_LE_AUDIO_BROADCASTER_ID))

    return btif_le_audio_broadcaster_get_interface();

#endif



  if (is_profile(profile_id, BT_PROFILE_VC_ID))

    return btif_volume_control_get_interface();

system/stack/BUILD.gn

+1 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ source_set("stack") { 
    "btm/btm_ble_gap.cc",

    "btm/btm_ble_multi_adv.cc",

    "btm/btm_ble_privacy.cc",

    "btm/btm_ble_scanner.cc",

    "btm/btm_client_interface.cc",

    "btm/btm_dev.cc",

    "btm/btm_devctl.cc",