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

Commit 12634182 authored by William Escande's avatar William Escande Committed by Gerrit Code Review
Browse files

Merge "gd/shim: Remove the Dumpsys module" into main

parents cdcf02a1 7abf7b3e

system/btif/src/bluetooth.cc

+2 −2
Original line number Diff line number Diff line
@@ -877,7 +877,7 @@ static int set_event_filter_connection_setup_all_devices() { 
  return BT_STATUS_SUCCESS;

}



static void dump(int fd, const char** arguments) {

static void dump(int fd, const char** /*arguments*/) {

  log::debug("Started bluetooth dumpsys");

  btif_debug_conn_dump(fd);

  btif_debug_bond_event_dump(fd);
@@ -911,7 +911,7 @@ static void dump(int fd, const char** arguments) { 
  DumpsysRecord(fd);

  L2CA_Dumpsys(fd);

  DumpsysBtm(fd);

  bluetooth::shim::Dump(fd, arguments);

  bluetooth::shim::Dump(fd);

  power_telemetry::GetInstance().Dumpsys(fd);

  log::debug("Finished bluetooth dumpsys");

}

system/gd/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -133,7 +133,6 @@ cc_defaults { 
        ":BluetoothNeighborSources",

        ":BluetoothOsSources",

        ":BluetoothPacketSources",

        ":BluetoothShimSources",

        ":BluetoothStorageSources",

        "module.cc",

        "stack_manager.cc",

system/gd/BUILD.gn

+0 −1
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ static_library("libbluetooth_gd") { 
    "//bt/system/gd/hal:BluetoothHalSources_socket_host",

    "//bt/system/gd/metrics:BluetoothMetricsSources",

    "//bt/system/gd/neighbor:BluetoothNeighborSources",

    "//bt/system/gd/shim:BluetoothShimSources",

    "//bt/system/gd/storage:BluetoothStorageSources",

    "//bt/system/gd/sysprops:BluetoothSyspropsSources",

    "//bt/system/pdl:BluetoothGeneratedPackets_h",

system/gd/shim/Android.bp

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
package {

    // See: http://go/android-license-faq

    // A large-scale-change added 'default_applicable_licenses' to import

    // all of the 'license_kinds' from "system_bt_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["system_bt_license"],

}



filegroup {

    name: "BluetoothShimSources",

    srcs: [

        "dumpsys.cc",

    ],

}

system/gd/shim/BUILD.gn

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
#

#  Copyright 2021 Google, Inc.

#

#  Licensed under the Apache License, Version 2.0 (the "License");

#  you may not use this file except in compliance with the License.

#  You may obtain a copy of the License at:

#

#  http://www.apache.org/licenses/LICENSE-2.0

#

#  Unless required by applicable law or agreed to in writing, software

#  distributed under the License is distributed on an "AS IS" BASIS,

#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

#  See the License for the specific language governing permissions and

#  limitations under the License.



source_set("BluetoothShimSources") {

  sources = [

    "dumpsys.cc",

  ]



  deps = [

    "//bt/flags:bluetooth_flags_c_lib",

    "//bt/system/pdl:BluetoothGeneratedPackets_h",

  ]



  configs += [

    "//bt/system/gd:gd_defaults",

    "//bt/system:external_flatbuffers",

  ]

}