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

Commit ee02f4df authored by Henri Chataing's avatar Henri Chataing
Browse files

system/btif/src: Migrate to libbluetooth_log 

Test: m com.android.btservices
Bug: 305066880
Flag: EXEMPT, mechanical refactor
Change-Id: I9168fdc9c2b5ce47686336e8e1673df62586974b
parent 830cf804

system/bta/hearing_aid/hearing_aid_audio_source.cc

+0 −2
Original line number Diff line number Diff line
@@ -40,8 +40,6 @@ using namespace bluetooth; 


namespace fmt {

template <>

struct formatter<bt_status_t> : enum_formatter<bt_status_t> {};

template <>

struct formatter<tUIPC_EVENT> : enum_formatter<tUIPC_EVENT> {};

template <>

struct formatter<tHEARING_AID_CTRL_ACK>

system/bta/include/bta_api.h

+2 −0
Original line number Diff line number Diff line
@@ -974,6 +974,8 @@ void DumpsysBtaDm(int fd); 
namespace fmt {

template <>

struct formatter<tBTA_DM_SEARCH_EVT> : enum_formatter<tBTA_DM_SEARCH_EVT> {};

template <>

struct formatter<tBTA_DM_ACL_EVT> : enum_formatter<tBTA_DM_ACL_EVT> {};

}  // namespace fmt



#endif /* BTA_API_H */

system/bta/include/bta_api_data_types.h

+6 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#pragma once



#include <base/strings/stringprintf.h>

#include <bluetooth/log.h>



#include <cstdint>

#include <string>
@@ -61,3 +62,8 @@ typedef struct { 
typedef struct {

  RawAddress bd_addr;

} tBTA_DM_KEY_MISSING;



namespace fmt {

template <>

struct formatter<tBTA_STATUS> : enum_formatter<tBTA_STATUS> {};

}  // namespace fmt

system/bta/include/bta_sec_api.h

+6 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 


#include <base/functional/callback.h>

#include <base/strings/stringprintf.h>

#include <bluetooth/log.h>



#include <cstdint>
@@ -495,3 +496,8 @@ void BTA_DmSirkSecCbRegister(tBTA_DM_SEC_CBACK* p_cback); 
 *

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

void BTA_DmSirkConfirmDeviceReply(const RawAddress& bd_addr, bool accept);



namespace fmt {

template <>

struct formatter<tBTA_DM_SEC_EVT> : enum_formatter<tBTA_DM_SEC_EVT> {};

}  // namespace fmt

system/btif/Android.bp

+9 −1
Original line number Diff line number Diff line
@@ -287,6 +287,7 @@ cc_test { 
    ],

    header_libs: ["libbluetooth_headers"],

    shared_libs: [

        "libbase",

        "libcrypto",

        "libcutils",

        "libhidlbase",
@@ -396,7 +397,10 @@ cc_test { 
    cflags: [

        "-Wno-unused-parameter",

    ],

    shared_libs: ["liblog"],

    shared_libs: [

        "libbase",

        "liblog",

    ],

}



// btif avrcp audio track unit tests
@@ -430,6 +434,7 @@ cc_test { 
        "libosi",

    ],

    shared_libs: [

        "libbase",

        "liblog",

    ],

    cflags: [
@@ -460,6 +465,7 @@ cc_test { 
    ],

    header_libs: ["libbluetooth_headers"],

    shared_libs: [

        "libbase",

        "libcrypto",

        "libcutils",

        "liblog",
@@ -510,6 +516,7 @@ cc_test { 
    ],

    header_libs: ["libbluetooth_headers"],

    shared_libs: [

        "libbase",

        "libbinder_ndk",

        "libcrypto",

        "libcutils",
@@ -551,6 +558,7 @@ cc_test { 
    ],

    header_libs: ["libbluetooth_headers"],

    shared_libs: [

        "libbase",

        "libcutils",

        "liblog",

    ],