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

Commit f0635bec authored by Myles Watson's avatar Myles Watson Committed by Automerger Merge Worker
Browse files

Merge changes I21835f10,Ic197074f into main am: 00fcbc80 

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



Change-Id: I61caaae72ba987944eb9242353012e2239a7d94c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9a497d5c 00fcbc80

system/gd/Android.bp

+0 −5
Original line number Diff line number Diff line
@@ -197,7 +197,6 @@ cc_library { 
    ],

    min_sdk_version: "31",

    static_libs: ["libchrome"],

    cflags: ["-Wno-unused-parameter"],

}



cc_library {
@@ -236,7 +235,6 @@ cc_library { 
    ],

    cflags: [

        "-DUSE_FAKE_TIMERS",

        "-Wno-unused-parameter",

    ],

    static_libs: [

        "libbluetooth-types",
@@ -330,7 +328,6 @@ cc_binary { 
        address: true,

        cfi: true,

    },

    cflags: ["-Wno-unused-parameter"],

}



cc_test {
@@ -435,7 +432,6 @@ cc_test { 
        address: true,

    },

    min_sdk_version: "Tiramisu",

    cflags: ["-Wno-unused-parameter"],

}



cc_test {
@@ -484,7 +480,6 @@ cc_test { 
        },

    },

    min_sdk_version: "30",

    cflags: ["-Wno-unused-parameter"],

}



cc_defaults {

system/gd/packet/parser/struct_def.cc

+1 −1
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ void StructDef::GenConstructor(std::ostream& s) const { 
  // Initialize remaining fields.

  add_comma = parent_ != nullptr;

  for (auto const& field : params) {

    if (parent_params.GetField(field->GetName()) != nullptr) {

    if (fields_.GetField(field->GetName()) == nullptr) {

      continue;

    }

    if (add_comma) {

system/gd/packet/parser/test/generated_packet_test.cc

+9 −0
Original line number Diff line number Diff line
@@ -1988,6 +1988,15 @@ TEST(GeneratedPacketTest, testCreateOptional) { 
  ASSERT_TRUE(grandchild_view.has_value());

}



TEST(GeneratedPacketTest, testStructWithShadowedNames) {

  uint32_t four_bytes = 0x01020304;

  StructType struct_type = StructType::TWO_BYTE;

  auto ebs = AtLeastFourByteStruct(four_bytes, struct_type);



  ASSERT_EQ(ebs.four_bytes_, four_bytes);

  ASSERT_EQ(ebs.struct_type_, struct_type);

}



}  // namespace parser

}  // namespace packet

}  // namespace bluetooth