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

Commit c42ae6ce authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I1dd3c521,Ia253a75f 

* changes:
  floss: Add missing #include <limits>
  floss: Make __file__ relative to root
parents 52afccd5 6c286776

system/BUILD.gn

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

    "-Wno-pessimizing-move",

    "-Wno-unknown-warning-option",

    "-Wno-unknown-warning-option",

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

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



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

  ]

  ]





  cflags_cc = [

  cflags_cc = [

system/bta/groups/groups.cc

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

 * limitations under the License.

 */

 */





#include <base/logging.h>



#include <algorithm>

#include <algorithm>

#include <limits>

#include <map>

#include <map>

#include <unordered_set>

#include <unordered_set>





#include "base/logging.h"

#include "bta_groups.h"

#include "bta_groups.h"

#include "btif_storage.h"

#include "btif_storage.h"

#include "types/bluetooth/uuid.h"

#include "types/bluetooth/uuid.h"

#include "types/raw_address.h"

#include "types/raw_address.h"





#include <base/logging.h>



using bluetooth::Uuid;

using bluetooth::Uuid;





namespace bluetooth {

namespace bluetooth {