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

Commit 2f65311b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix build failures due to libchrome" am: 6187ac30 am: eb68f68e am: 9826e3cd 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1828092

Change-Id: I07483b979bb54a3924559f712973039bd9c0c19e
parents ad976bfd 9826e3cd

system/bta/csis/csis_client_test.cc

+1 −1
Original line number Diff line number Diff line
@@ -16,10 +16,10 @@ 
 */



#include <base/bind.h>

#include <base/bind_helpers.h>

#include <gmock/gmock.h>

#include <gtest/gtest.h>



#include "bind_helpers.h"

#include "bta_csis_api.h"

#include "bta_dm_api_mock.h"

#include "bta_gatt_api_mock.h"

system/bta/include/bta_csis_api.h

+1 −1
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 
 */

#pragma once



#include "base/bind_helpers.h"

#include "base/callback.h"

#include "bind_helpers.h"

#include "bta/include/bta_groups.h"

#include "hardware/bt_csis.h"

system/btif/src/btif_csis_client.cc

+1 −1
Original line number Diff line number Diff line
@@ -16,12 +16,12 @@ 
 */



#include <base/bind.h>

#include <base/bind_helpers.h>

#include <base/location.h>

#include <base/logging.h>

#include <hardware/bluetooth.h>

#include <hardware/bt_csis.h>



#include "bind_helpers.h"

#include "bta_csis_api.h"

#include "btif_common.h"

#include "btif_storage.h"