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

Commit d5634296 authored by Myles Watson's avatar Myles Watson Committed by Gerrit Code Review
Browse files

Merge changes I0baa8134,I4d94617d,I5ffa5331 into main 

* changes:
  bt_target.h: Remove always true BTIF_DM_OOB_TEST
  Remove -DHAS_NO_BDROID_BUILDCFG
  Remove -DBUILDCFG from cflags
parents 072a2714 7fd46f24

system/audio_hal_interface/Android.bp

+0 −5
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ cc_library_static { 
    },

    host_supported: true,

    cflags: [

        "-DBUILDCFG",

        "-Wno-unused-parameter",

        "-Wthread-safety",

    ],
@@ -121,9 +120,6 @@ cc_test { 
        "libbt_shim_bridge",

        "libchrome",

    ],

    cflags: [

        "-DBUILDCFG",

    ],

    header_libs: ["libbluetooth_headers"],

}
@@ -139,7 +135,6 @@ cc_test { 
        "mts_defaults",

    ],

    cflags: [

        "-DBUILDCFG",

        "-DUNIT_TESTS",

        "-Wno-unused-parameter",

    ],

system/bta/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ cc_defaults { 
    generated_headers: [

        "BluetoothGeneratedDumpsysDataSchema_h",

    ],

    cflags: ["-DBUILDCFG"],

}



filegroup {

system/bta/dm/bta_dm_sec.cc

+0 −4
Original line number Diff line number Diff line
@@ -557,20 +557,16 @@ static tBTM_STATUS bta_dm_sp_cback(tBTM_SP_EVT event, 
      break;



    case BTM_SP_LOC_OOB_EVT:

#ifdef BTIF_DM_OOB_TEST

      btif_dm_proc_loc_oob(BT_TRANSPORT_BR_EDR,

                           (bool)(p_data->loc_oob.status == BTM_SUCCESS),

                           p_data->loc_oob.c, p_data->loc_oob.r);

#endif

      break;



    case BTM_SP_RMT_OOB_EVT: {

      Octet16 c;

      Octet16 r;

      sp_rmt_result = false;

#ifdef BTIF_DM_OOB_TEST

      sp_rmt_result = btif_dm_proc_rmt_oob(p_data->rmt_oob.bd_addr, &c, &r);

#endif

      log::verbose("result={}", sp_rmt_result);

      bta_dm_ci_rmt_oob(sp_rmt_result, p_data->rmt_oob.bd_addr, c, r);

      break;

system/btif/Android.bp

+0 −10
Original line number Diff line number Diff line
@@ -166,7 +166,6 @@ cc_library_static { 
        "libflatbuffers-cpp",

    ],

    cflags: [

        "-DBUILDCFG",

        "-Wno-unused-parameter",

    ],

    apex_available: [
@@ -255,7 +254,6 @@ cc_library_static { 
        "libcrypto",

    ],

    cflags: [

        "-DBUILDCFG",

        "-Wno-unused-parameter",

        /* we export all classes, so change default visibility, instead of having EXPORT_SYMBOL on each class*/

        "-fvisibility=default",
@@ -364,7 +362,6 @@ cc_test { 
            ],

        },

    },

    cflags: ["-DBUILDCFG"],

    sanitize: {

        integer_overflow: true,

    },
@@ -397,7 +394,6 @@ cc_test { 
        "libosi",

    ],

    cflags: [

        "-DBUILDCFG",

        "-Wno-unused-parameter",

    ],

    shared_libs: ["liblog"],
@@ -437,7 +433,6 @@ cc_test { 
        "liblog",

    ],

    cflags: [

        "-DBUILDCFG",

        "-Wno-unused-parameter",

    ],

}
@@ -487,7 +482,6 @@ cc_test { 
        },

    },

    cflags: [

        "-DBUILDCFG",

        "-Wno-unused-parameter",

    ],

    sanitize: {
@@ -531,7 +525,6 @@ cc_test { 
        "libgmock",

        "libosi",

    ],

    cflags: ["-DBUILDCFG"],

    target: {

        android: {

            static_libs: [
@@ -571,7 +564,6 @@ cc_test { 
        "libcom.android.sysprop.bluetooth.wrapped",

    ],

    cflags: [

        "-DBUILDCFG",

        "-Wno-unused-parameter",

    ],

}
@@ -678,7 +670,6 @@ cc_test { 
        "libstatslog_bt",

    ],

    cflags: [

        "-DBUILDCFG",

        "-Wno-unused-parameter",

    ],

    target: {
@@ -801,7 +792,6 @@ cc_test { 
        "libstatslog_bt",

    ],

    cflags: [

        "-DBUILDCFG",

        "-Wno-unused-parameter",

    ],

    target: {

system/btif/include/btif_dm.h

+0 −2
Original line number Diff line number Diff line
@@ -90,14 +90,12 @@ void btif_dm_set_oob_for_io_req(tBTM_OOB_DATA* p_oob_data); 
void btif_dm_set_oob_for_le_io_req(const RawAddress& bd_addr,

                                   tBTM_OOB_DATA* p_oob_data,

                                   tBTM_LE_AUTH_REQ* p_auth_req);

#ifdef BTIF_DM_OOB_TEST

void btif_dm_load_local_oob(void);

void btif_dm_proc_loc_oob(tBT_TRANSPORT transport, bool is_valid,

                          const Octet16& c, const Octet16& r);

bool btif_dm_proc_rmt_oob(const RawAddress& bd_addr, Octet16* p_c,

                          Octet16* p_r);

void btif_dm_generate_local_oob_data(tBT_TRANSPORT transport);

#endif /* BTIF_DM_OOB_TEST */



void btif_dm_clear_event_filter();