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

Commit ecd26f92 authored by Henri Chataing's avatar Henri Chataing Committed by Automerger Merge Worker
Browse files

Merge "RootCanal: Inline gd_defaults and fluoride_common_options in Android.bp" am: 03e5fac5 

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



Change-Id: Ic3c3b6cbe725ece274b954cda5021e6ae6fb1e38
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 489ef4ce 03e5fac5

tools/rootcanal/Android.bp

+17 −9
Original line number Original line Diff line number Diff line
@@ -19,7 +19,6 @@ cc_defaults { 
    tidy_checks: [

    tidy_checks: [

        "-*",

        "-*",

        "readability-*",

        "readability-*",



        "-readability-function-size",

        "-readability-function-size",

        "-readability-identifier-length",

        "-readability-identifier-length",

        "-readability-implicit-bool-conversion",

        "-readability-implicit-bool-conversion",
@@ -32,12 +31,22 @@ cc_defaults { 
    tidy_flags: [

    tidy_flags: [

        "--header-filter=^.*tools\\/rootcanal\\/(model|include|net|desktop)\\/(.(?!\\.pb\\.h))*$",

        "--header-filter=^.*tools\\/rootcanal\\/(model|include|net|desktop)\\/(.(?!\\.pb\\.h))*$",

    ],

    ],

    defaults: [

    sanitize: {

        "fluoride_common_options",

        address: true,

        "gd_defaults",

        all_undefined: true,

    ],

        misc_undefined: ["bounds"],

    },

    c_std: "c99",

    cpp_std: "c++17",

    cflags: [

    cflags: [

        "-Wall",

        "-Werror",

        "-Wextra",

        "-fvisibility=hidden",

        "-fvisibility=hidden",

        "-DGOOGLE_PROTOBUF_NO_RTTI",

    ],

    include_dirs: [

        "packages/modules/Bluetooth/system/gd",

    ],

    ],

    local_include_dirs: [

    local_include_dirs: [

        "include",

        "include",
@@ -148,6 +157,9 @@ cc_library_host_shared { 
    defaults: [

    defaults: [

        "rootcanal_defaults",

        "rootcanal_defaults",

    ],

    ],

    sanitize: {

        address: false,

    },

    srcs: [

    srcs: [

        ":BluetoothPacketSources",

        ":BluetoothPacketSources",

        ":lib_sources",

        ":lib_sources",
@@ -395,10 +407,6 @@ cc_binary_host { 
        "libprotobuf-cpp-full",

        "libprotobuf-cpp-full",

        "libscriptedbeaconpayload-protos-lite",

        "libscriptedbeaconpayload-protos-lite",

    ],

    ],

    sanitize: {

        address: true,

        all_undefined: true,

    },

    target: {

    target: {

        // TODO(b/181290178) remove it when sanitize option is supported by linux_bionic as well

        // TODO(b/181290178) remove it when sanitize option is supported by linux_bionic as well

        linux_bionic: {

        linux_bionic: {

tools/rootcanal/model/controller/dual_mode_controller.cc

+1 −1
Original line number Original line Diff line number Diff line
@@ -2949,7 +2949,7 @@ void DualModeController::CsrReadVarid(CsrVarid varid, 
}

}





void DualModeController::CsrWriteVarid(

void DualModeController::CsrWriteVarid(

    CsrVarid varid, std::vector<uint8_t> const& value) const {

    CsrVarid varid, std::vector<uint8_t> const& /*value*/) const {

  INFO(id_, "Unsupported write of CSR varid 0x{:04x}", varid);

  INFO(id_, "Unsupported write of CSR varid 0x{:04x}", varid);

}

}

tools/rootcanal/model/controller/le_advertiser.cc

+1 −1
Original line number Original line Diff line number Diff line
@@ -1594,7 +1594,7 @@ ErrorCode LinkLayerController::LeSetPeriodicAdvertisingEnable( 
}

}





uint16_t ExtendedAdvertiser::GetMaxPeriodicAdvertisingDataLength(

uint16_t ExtendedAdvertiser::GetMaxPeriodicAdvertisingDataLength(

    slots periodic_advertising_interval) {

    slots /*periodic_advertising_interval*/) {

  // TODO: evaluate the maximum length of the advertising PDU that can

  // TODO: evaluate the maximum length of the advertising PDU that can

  // be physically sent in the advertising interval.

  // be physically sent in the advertising interval.

  return max_extended_advertising_pdu_size;

  return max_extended_advertising_pdu_size;

tools/rootcanal/model/devices/device.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -53,8 +53,8 @@ class Device { 
  virtual void Close();

  virtual void Close();





  virtual void ReceiveLinkLayerPacket(

  virtual void ReceiveLinkLayerPacket(

      model::packets::LinkLayerPacketView packet, Phy::Type type,

      model::packets::LinkLayerPacketView /*packet*/, Phy::Type /*type*/,

      int8_t rssi){};

      int8_t /*rssi*/){};





  void SendLinkLayerPacket(

  void SendLinkLayerPacket(

      std::shared_ptr<model::packets::LinkLayerPacketBuilder> packet,

      std::shared_ptr<model::packets::LinkLayerPacketBuilder> packet,

tools/rootcanal/model/hci/hci_sniffer.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -44,7 +44,7 @@ class HciSniffer : public HciTransport { 
  static std::shared_ptr<HciTransport> Create(

  static std::shared_ptr<HciTransport> Create(

      std::shared_ptr<HciTransport> transport,

      std::shared_ptr<HciTransport> transport,

      std::shared_ptr<std::ostream> outputStream = nullptr,

      std::shared_ptr<std::ostream> outputStream = nullptr,

      std::shared_ptr<PcapFilter> filter = nullptr) {

      std::shared_ptr<PcapFilter> /*filter*/ = nullptr) {

    return std::make_shared<HciSniffer>(transport, outputStream);

    return std::make_shared<HciSniffer>(transport, outputStream);

  }

  }