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

Commit 7caad527 authored by Chris Manton's avatar Chris Manton
Browse files

Consolidate net_test_hf_client_add_record into net_bta_test 

Bug: 267694449
Test: cert/run
Tag: #gd-refactor

Change-Id: I3e64670286d6d1e717143467ab30f4d9405515bf
parent dc378257

system/bta/Android.bp

+4 −37
Original line number Diff line number Diff line
@@ -191,11 +191,12 @@ cc_test { 
        ":TestMockStackBtm",

        ":TestCommonLogMsg",

        ":TestCommonMockFunctions",

        "test/bta_hf_client_test.cc",

        "test/bta_dm_cust_uuid_test.cc",

        "test/bta_dip_test.cc",

        "test/gatt/database_builder_test.cc",

        "test/bta_dm_cust_uuid_test.cc",

        "test/bta_hf_client_add_record_test.cc",

        "test/bta_hf_client_test.cc",

        "test/gatt/database_builder_sample_device_test.cc",

        "test/gatt/database_builder_test.cc",

        "test/gatt/database_test.cc",

    ],

    shared_libs: [
@@ -309,40 +310,6 @@ cc_test { 
    },

}



// bta hf client add record tests for target

cc_test {

    name: "net_test_hf_client_add_record",

    defaults: [

        "fluoride_defaults",

        "mts_defaults",

    ],

    test_suites: ["device-tests"],

    include_dirs: [

        "packages/modules/Bluetooth/system",

        "packages/modules/Bluetooth/system/gd",

        "packages/modules/Bluetooth/system/bta/include",

        "packages/modules/Bluetooth/system/bta/sys",

        "packages/modules/Bluetooth/system/btif/include",

        "packages/modules/Bluetooth/system/internal_include",

        "packages/modules/Bluetooth/system/stack/include",

        "packages/modules/Bluetooth/system/utils/include",

    ],

    srcs: [

        ":TestCommonLogMsg",

        "test/bta_hf_client_add_record_test.cc",

    ],

    header_libs: ["libbluetooth_headers"],

    shared_libs: [

        "libcutils",

        "liblog",

    ],

    static_libs: [

        "libbluetooth-types",

        "libosi",

    ],

    cflags: ["-DBUILDCFG"],

}



// csis unit tests for host

cc_test {

    name: "bluetooth_csis_test",

system/bta/hf_client/bta_hf_client_int.h

+1 −1
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ extern void bta_hf_client_dump_statistics(int fd); 
extern void bta_hf_client_cb_arr_init(void);



/* SDP functions */

extern bool bta_hf_client_add_record(char* p_service_name, uint8_t scn,

extern bool bta_hf_client_add_record(const char* p_service_name, uint8_t scn,

                                     tBTA_HF_CLIENT_FEAT features,

                                     uint32_t sdp_handle);

extern void bta_hf_client_create_record(tBTA_HF_CLIENT_CB_ARR* client_cb,

system/bta/test/bta_hf_client_add_record_test.cc

+0 −4
Original line number Diff line number Diff line
@@ -26,10 +26,6 @@ 


static uint16_t gVersion;



// Define appl_trace_level even though LogMsg is trivial.  This is required when

// coverage is enabled because the compiler is unable to eliminate the `if`

// checks against appl_trace_level in APPL_TRACE_* macros.

uint8_t appl_trace_level = 0;

bool SDP_AddProtocolList(uint32_t handle, uint16_t num_elem,

                         tSDP_PROTOCOL_ELEM* p_elem_list) {

  return false;