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

Commit 9ad82efd authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "floss: Fix build errors" am: 66929f7d am: 65c62695 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/1949557

Change-Id: I9b4f10952180cfb5e3738cc604a963a7455af1a2
parents 332d0727 65c62695

system/bta/BUILD.gn

+1 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ static_library("bta") { 
  ]



  deps = [

    "//bt/system:libbt-platform-protos-lite",

    "//bt/system/gd/rust/shim:shim_bridge_header",

    "//bt/system/gd/rust/shim:init_flags_bridge_header",

    "//bt/system/gd/rust/shim:message_loop_thread_bridge_header",

system/stack/include/ble_advertiser.h

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ typedef struct { 
  uint8_t primary_advertising_phy;

  uint8_t secondary_advertising_phy;

  uint8_t scan_request_notification_enable;

  int8_t own_address_type;

  uint8_t own_address_type;

} tBTM_BLE_ADV_PARAMS;



typedef struct {