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

Commit 83a3fa87 authored by Abhishek Pandit-Subedi's avatar Abhishek Pandit-Subedi
Browse files

floss: build: Add btm_ble_scanner and remove leaudio 

Add missing btm_ble_scanner.cc to BUILD and remove leaudio entirely from
build. LeAudio was in a half-building state before and new changes were
breaking the build so remove it entirely.

Bug: 216863527
Tag: #floss
Test: Build on ChromeOS
Change-Id: Ic5aeec3e2464d8adb0cda5582fde8e3a1921c45e
Merged-In: Ic5aeec3e2464d8adb0cda5582fde8e3a1921c45e
parent 2f97b037

system/bta/BUILD.gn

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

    "gatt/database.cc",

    "gatt/database_builder.cc",

    "gatt/database_builder.cc",

    "groups/groups.cc",

    "groups/groups.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.cc",

    "hearing_aid/hearing_aid_audio_source.cc",

    "hearing_aid/hearing_aid_audio_source.cc",

    "hf_client/bta_hf_client_act.cc",

    "hf_client/bta_hf_client_act.cc",

system/btif/BUILD.gn

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

    "src/btif_gatt_util.cc",

    "src/btif_hd.cc",

    "src/btif_hd.cc",

    "src/btif_vc.cc",

    "src/btif_vc.cc",

    "src/btif_le_audio_broadcaster.cc",

    #"src/btif_le_audio_broadcaster.cc",

    #"src/btif_has_client.cc",

    "src/btif_hearing_aid.cc",

    "src/btif_hearing_aid.cc",

    "src/btif_hf.cc",

    "src/btif_hf.cc",

    "src/btif_hf_client.cc",

    "src/btif_hf_client.cc",

system/btif/src/bluetooth.cc

+8 −0
Original line number Original line Diff line number Diff line
@@ -89,8 +89,10 @@ 




using bluetooth::csis::CsisClientInterface;

using bluetooth::csis::CsisClientInterface;

using bluetooth::hearing_aid::HearingAidInterface;

using bluetooth::hearing_aid::HearingAidInterface;

#ifndef TARGET_FLOSS

using bluetooth::le_audio::LeAudioBroadcasterInterface;

using bluetooth::le_audio::LeAudioBroadcasterInterface;

using bluetooth::le_audio::LeAudioClientInterface;

using bluetooth::le_audio::LeAudioClientInterface;

#endif

using bluetooth::vc::VolumeControlInterface;

using bluetooth::vc::VolumeControlInterface;





/*******************************************************************************

/*******************************************************************************
@@ -133,10 +135,12 @@ extern const btrc_ctrl_interface_t* btif_rc_ctrl_get_interface(); 
extern const btsdp_interface_t* btif_sdp_get_interface();

extern const btsdp_interface_t* btif_sdp_get_interface();

/*Hearing Aid client*/

/*Hearing Aid client*/

extern HearingAidInterface* btif_hearing_aid_get_interface();

extern HearingAidInterface* btif_hearing_aid_get_interface();

#ifndef TARGET_FLOSS

/* LeAudio testi client */

/* LeAudio testi client */

extern LeAudioClientInterface* btif_le_audio_get_interface();

extern LeAudioClientInterface* btif_le_audio_get_interface();

/* LeAudio Broadcaster */

/* LeAudio Broadcaster */

extern LeAudioBroadcasterInterface* btif_le_audio_broadcaster_get_interface();

extern LeAudioBroadcasterInterface* btif_le_audio_broadcaster_get_interface();

#endif

/* Coordinated Set Service Client */

/* Coordinated Set Service Client */

extern CsisClientInterface* btif_csis_client_get_interface();

extern CsisClientInterface* btif_csis_client_get_interface();

/* Volume Control client */

/* Volume Control client */
@@ -417,8 +421,10 @@ static void dump(int fd, const char** arguments) { 
  alarm_debug_dump(fd);

  alarm_debug_dump(fd);

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

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

  HearingAid::DebugDump(fd);

  HearingAid::DebugDump(fd);

#ifndef TARGET_FLOSS

  LeAudioClient::DebugDump(fd);

  LeAudioClient::DebugDump(fd);

  LeAudioBroadcaster::DebugDump(fd);

  LeAudioBroadcaster::DebugDump(fd);

#endif

  connection_manager::dump(fd);

  connection_manager::dump(fd);

  bluetooth::bqr::DebugDump(fd);

  bluetooth::bqr::DebugDump(fd);

  bluetooth::shim::Dump(fd, arguments);

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

    return bluetooth::activity_attribution::get_activity_attribution_instance();

  }

  }





#ifndef TARGET_FLOSS

  if (is_profile(profile_id, BT_PROFILE_LE_AUDIO_ID))

  if (is_profile(profile_id, BT_PROFILE_LE_AUDIO_ID))

    return btif_le_audio_get_interface();

    return btif_le_audio_get_interface();





  if (is_profile(profile_id, BT_PROFILE_LE_AUDIO_BROADCASTER_ID))

  if (is_profile(profile_id, BT_PROFILE_LE_AUDIO_BROADCASTER_ID))

    return btif_le_audio_broadcaster_get_interface();

    return btif_le_audio_broadcaster_get_interface();

#endif





  if (is_profile(profile_id, BT_PROFILE_VC_ID))

  if (is_profile(profile_id, BT_PROFILE_VC_ID))

    return btif_volume_control_get_interface();

    return btif_volume_control_get_interface();

system/stack/BUILD.gn

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

    "btm/btm_ble_gap.cc",

    "btm/btm_ble_multi_adv.cc",

    "btm/btm_ble_multi_adv.cc",

    "btm/btm_ble_privacy.cc",

    "btm/btm_ble_privacy.cc",

    "btm/btm_ble_scanner.cc",

    "btm/btm_client_interface.cc",

    "btm/btm_client_interface.cc",

    "btm/btm_dev.cc",

    "btm/btm_dev.cc",

    "btm/btm_devctl.cc",

    "btm/btm_devctl.cc",