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

Commit 36e90951 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Linux build fix"

parents f83c0b94 4533a279

system/bta/BUILD.gn

+9 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ static_library("bta") { 
    "ag/bta_ag_api.cc",

    "ag/bta_ag_at.cc",

    "ag/bta_ag_cfg.cc",

    "ag/bta_ag_ci.cc",

    "ag/bta_ag_cmd.cc",

    "ag/bta_ag_main.cc",

    "ag/bta_ag_rfc.cc",
@@ -50,6 +49,8 @@ static_library("bta") { 
    "gatt/bta_gatts_api.cc",

    "gatt/bta_gatts_main.cc",

    "gatt/bta_gatts_utils.cc",

    "hearing_aid/hearing_aid.cc",

    "hearing_aid/hearing_aid_audio_source.cc",

    "hf_client/bta_hf_client_act.cc",

    "hf_client/bta_hf_client_api.cc",

    "hf_client/bta_hf_client_at.cc",
@@ -100,6 +101,7 @@ static_library("bta") { 
    "include",

    "sys",

    "//",

    "//internal_include",

    "//btcore/include",

    "//hci/include",

    "//internal_include",
@@ -108,6 +110,12 @@ static_library("bta") { 
    "//udrv/include",

    "//utils/include",

    "//vnd/include",

    "//btif/include",

    "//btif/avrcp",

    "//include/hardware/avrcp",

    "//profile/avrcp",

    "//packet/avrcp",

    "//packet/base",

  ]



  deps = [

system/btif/BUILD.gn

+5 −2
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ static_library("btif") { 
    "src/btif_a2dp_sink.cc",

    "src/btif_a2dp_source.cc",

    "src/btif_av.cc",

    "avrcp/avrcp_service.cc",



    #TODO(jpawlowski): heavily depends on Android,

    #   "src/btif_avrcp_audio_track.cc",
@@ -66,7 +67,6 @@ static_library("btif") { 


  # BTIF callouts

  sources += [

    "co/bta_ag_co.cc",

    "co/bta_dm_co.cc",

    "co/bta_av_co.cc",

    "co/bta_hh_co.cc",
@@ -88,15 +88,18 @@ static_library("btif") { 
    "//hci/include",

    "//stack/a2dp",

    "//stack/btm",

    "//stack/l2cap",

    "//stack/include",

    "//third_party/tinyxml2",

    "//internal_include",

    "//udrv/include",

    "//utils/include",

    "//vnd/include",

    "//profile/avrcp",

  ]



  deps = [

    "//third_party/libchrome:base"

    "//third_party/libchrome:base",

    "//profile/avrcp:profile_avrcp"

  ]

}

system/btif/avrcp/avrcp_service.h

+2 −2
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ 
#include <map>

#include <memory>



#include "avrcp.h"

#include "connection_handler.h"

#include "hardware/avrcp/avrcp.h"

#include "osi/include/properties.h"

#include "profile/avrcp/connection_handler.h"

#include "raw_address.h"



namespace bluetooth {

system/btif/src/bluetooth.cc

+1 −1
Original line number Diff line number Diff line
@@ -47,10 +47,10 @@ 
#include <hardware/bt_sdp.h>

#include <hardware/bt_sock.h>



#include "avrcp_service.h"

#include "bt_utils.h"

#include "bta/include/bta_hearing_aid_api.h"

#include "bta/include/bta_hf_client_api.h"

#include "btif/avrcp/avrcp_service.h"

#include "btif_a2dp.h"

#include "btif_api.h"

#include "btif_av.h"

system/btif/src/btif_hearing_aid.cc

+2 −2
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ class HearingAidInterfaceImpl 
      public HearingAidCallbacks {

  ~HearingAidInterfaceImpl() = default;



  void Init(HearingAidCallbacks* callbacks) {

  void Init(HearingAidCallbacks* callbacks) override {

    DVLOG(2) << __func__;

    this->callbacks = callbacks;

    do_in_bta_thread(
@@ -114,7 +114,7 @@ class HearingAidInterfaceImpl 
                     Bind(&btif_storage_remove_hearing_aid, address));

  }



  void Cleanup(void) {

  void Cleanup(void) override {

    DVLOG(2) << __func__;

    do_in_bta_thread(FROM_HERE, Bind(&HearingAid::CleanUp));

  }