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

Commit 1588e25e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes I1dd3c521,Ia253a75f am: c42ae6ce 

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

Change-Id: Ie300bd4a19acf26dbcba3070c301c0c6ae8aa2b4
parents adad2481 c42ae6ce

system/BUILD.gn

+2 −0
Original line number Diff line number Diff line
@@ -102,6 +102,8 @@ config("target_defaults") { 
    "-Wno-pessimizing-move",

    "-Wno-unknown-warning-option",

    "-Wno-final-dtor-non-final-class",



    string_join("", ["-ffile-prefix-map=", rebase_path(".", "${root_build_dir}", "."), "/= "])

  ]



  cflags_cc = [

system/bta/groups/groups.cc

+3 −3
Original line number Diff line number Diff line
@@ -15,18 +15,18 @@ 
 * limitations under the License.

 */



#include <base/logging.h>



#include <algorithm>

#include <limits>

#include <map>

#include <unordered_set>



#include "base/logging.h"

#include "bta_groups.h"

#include "btif_storage.h"

#include "types/bluetooth/uuid.h"

#include "types/raw_address.h"



#include <base/logging.h>



using bluetooth::Uuid;



namespace bluetooth {