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

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

Merge "Separate BTM_SEC_CB from types" into main

parents 38c1386c 1fd916bd

system/main/shim/acl.cc

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
#include "osi/include/allocator.h"

#include "stack/acl/acl.h"

#include "stack/btm/btm_int_types.h"

#include "stack/btm/btm_sec_int_types.h"

#include "stack/btm/btm_sec_cb.h"

#include "stack/include/bt_hdr.h"

#include "stack/l2cap/l2c_int.h"

#include "types/ble_address_with_type.h"

system/main/shim/le_scanning_manager.cc

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
#include "main/shim/le_scanning_manager.h"

#include "main/shim/shim.h"

#include "stack/btm/btm_int_types.h"

#include "stack/btm/btm_sec_int_types.h"

#include "stack/btm/btm_sec_cb.h"

#include "stack/include/btm_log_history.h"

#include "storage/device.h"

#include "storage/le_device.h"

system/main/test/main_shim_test.cc

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
#include "os/thread.h"

#include "packet/packet_view.h"

#include "stack/btm/btm_int_types.h"

#include "stack/btm/btm_sec_int_types.h"

#include "stack/btm/btm_sec_cb.h"

#include "stack/include/acl_hci_link_interface.h"

#include "stack/include/ble_acl_interface.h"

#include "stack/include/bt_hdr.h"

system/stack/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -258,6 +258,7 @@ cc_library_static { 
        "btm/btm_sco_hci.cc",

        "btm/btm_sco_hfp_hal.cc",

        "btm/btm_sec.cc",

        "btm/btm_sec_cb.cc",

        "btu/btu_event.cc",

        "btu/btu_hcif.cc",

        "eatt/eatt.cc",
@@ -1529,6 +1530,7 @@ cc_test { 
        "btm/btm_sco_hci.cc",

        "btm/btm_sco_hfp_hal.cc",

        "btm/btm_sec.cc",

        "btm/btm_sec_cb.cc",

        "btm/hfp_lc3_decoder.cc",

        "btm/hfp_lc3_encoder.cc",

        "btm/hfp_msbc_decoder.cc",

system/stack/BUILD.gn

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

    "btm/btm_sco_hfp_hal_linux.cc",

    "btm/btm_sec.cc",

    "btm/btm_sec_cb.cc",

    "btm/hfp_lc3_encoder_linux.cc",

    "btm/hfp_lc3_decoder_linux.cc",

    "btm/hfp_msbc_encoder.cc",