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

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

Merge "gd/shim: Cleanup dead code in dumpsys implementation" into main

parents 9bb9aa3c 3720e100

system/gd/Android.bp

+0 −4
Original line number Diff line number Diff line
@@ -761,7 +761,6 @@ genrule { 
    ],

    cmd: "$(location flatc) -I packages/modules/Bluetooth/system/gd -b --schema -o $(genDir) $(in) ",

    srcs: [

        "common/init_flags.fbs",

        "dumpsys_data.fbs",

        "hci/hci_acl_manager.fbs",

        "hci/hci_controller.fbs",
@@ -774,7 +773,6 @@ genrule { 
        "dumpsys_data.bfbs",

        "hci_acl_manager.bfbs",

        "hci_controller.bfbs",

        "init_flags.bfbs",

        "wakelock_manager.bfbs",

    ],

}
@@ -786,7 +784,6 @@ genrule { 
    ],

    cmd: "$(location flatc) -I packages/modules/Bluetooth/system/gd -o $(genDir) --cpp $(in) ",

    srcs: [

        "common/init_flags.fbs",

        "dumpsys_data.fbs",

        "hci/hci_acl_manager.fbs",

        "hci/hci_controller.fbs",
@@ -799,7 +796,6 @@ genrule { 
        "dumpsys_generated.h",

        "hci_acl_manager_generated.h",

        "hci_controller_generated.h",

        "init_flags_generated.h",

        "wakelock_manager_generated.h",

    ],

}

system/gd/BUILD.gn

+0 −2
Original line number Diff line number Diff line
@@ -94,7 +94,6 @@ static_library("libbluetooth_gd") { 


flatbuffer("BluetoothGeneratedDumpsysDataSchema_h") {

  sources = [

    "common/init_flags.fbs",

    "dumpsys_data.fbs",

    "hci/hci_acl_manager.fbs",

    "hci/hci_controller.fbs",
@@ -105,7 +104,6 @@ flatbuffer("BluetoothGeneratedDumpsysDataSchema_h") { 


bt_flatc_binary_schema("BluetoothGeneratedDumpsysBinarySchema_bfbs") {

  sources = [

    "common/init_flags.fbs",

    "dumpsys_data.fbs",

    "hci/hci_acl_manager.fbs",

    "hci/hci_controller.fbs",

system/gd/common/init_flags.fbs

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
namespace bluetooth.common;



attribute "privacy";



table InitFlagsData {

    title:string (privacy:"Any");

    values:[InitFlagValue] (privacy:"Any");

}



table InitFlagValue {

    flag:string (privacy:"Any");

    value:string (privacy:"Any");

}



root_type InitFlagsData;

system/gd/dumpsys_data.fbs

+0 −2
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
// privacy:"Any"





include "common/init_flags.fbs";

include "hci/hci_acl_manager.fbs";

include "hci/hci_controller.fbs";

include "module_unittest.fbs";
@@ -22,7 +21,6 @@ attribute "privacy"; 


table DumpsysData {

    title:string (privacy:"Any");

    init_flags:common.InitFlagsData (privacy:"Any");

    wakelock_manager_data:bluetooth.os.WakelockManagerData (privacy:"Any");

    shim_dumpsys_data:bluetooth.shim.DumpsysModuleData (privacy:"Any");

    hci_acl_manager_dumpsys_data:bluetooth.hci.AclManagerData (privacy:"Any");

system/gd/shim/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -11,14 +11,12 @@ filegroup { 
    name: "BluetoothShimSources",

    srcs: [

        "dumpsys.cc",

        "dumpsys_args.cc",

    ],

}



filegroup {

    name: "BluetoothShimTestSources",

    srcs: [

        "dumpsys_args_test.cc",

        "dumpsys_test.cc",

    ],

}