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

Commit aeb63d0a authored by Abhishek Pandit-Subedi's avatar Abhishek Pandit-Subedi Committed by Automerger Merge Worker
Browse files

Merge "floss: Fix build breakages" am: 76e55632 am: 0d3ceb4b am:...

Merge "floss: Fix build breakages" am: 76e55632 am: 0d3ceb4b am: b78abe20 am: 31c14642 am: ff9a871c

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



Change-Id: Ie73af1b37a65873bd24f334d4591db3dcc994c5d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5a59ab29 ff9a871c
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ static_library("bta") {
    "dm/bta_dm_pm.cc",
    "gatt/bta_gattc_act.cc",
    "gatt/bta_gattc_api.cc",
    "gatt/bta_gattc_db_storage.cc",
    "gatt/bta_gattc_cache.cc",
    "gatt/bta_gattc_main.cc",
    "gatt/bta_gattc_utils.cc",
+3 −0
Original line number Diff line number Diff line
@@ -16,7 +16,10 @@
 *
 ******************************************************************************/

#include <base/logging.h>

#include "bta/gatt/bta_gattc_int.h"
#include "osi/include/log.h"

using gatt::StoredAttribute;

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@
#include <array>
#include <map>
#include <optional>
#include <vector>

#include "raw_address.h"