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

Commit c340dfbf authored by Henri Chataing's avatar Henri Chataing
Browse files

RootCanal: Move packets/hci/hci_packets.pdl -> packets/hci_packets.pdl 

The hci/ subfolder was required with bluetooth_packetgen to generate
the module with the correct namespace; that is no longer the case
with pdlc

Bug: 279665786
Test: m root-canal
Change-Id: I0bceedb3e6ad39fe6ffbd00e05f6a935de94c120
parent abfabd4a

tools/rootcanal/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ genrule { 
        " $(location :pdl_python_generator)" +

        " --output $(out) --custom-type-location py.bluetooth",

    srcs: [

        "packets/hci/hci_packets.pdl",

        "packets/hci_packets.pdl",

    ],

    out: [

        "hci_packets.py",
@@ -425,7 +425,7 @@ genrule { 
        " --include-header hci/address.h" +

        " --output $(out)",

    srcs: [

        "packets/hci/hci_packets.pdl",

        "packets/hci_packets.pdl",

    ],

    out: [

        "packets/hci_packets.h",
@@ -477,6 +477,6 @@ genrule { 
genrule {

    name: "rootcanal_hci_packets_rust_gen",

    defaults: ["pdl_rust_generator_defaults"],

    srcs: ["packets/hci/hci_packets.pdl"],

    srcs: ["packets/hci_packets.pdl"],

    out: ["hci_packets.rs"],

}

tools/rootcanal/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ endfunction() 


pdl_gen(

  NAME BluetoothGeneratedPackets_h

  INPUT ${ROOTCANAL_ROOT}/packets/hci/hci_packets.pdl

  INPUT ${ROOTCANAL_ROOT}/packets/hci_packets.pdl

  OUTPUT packets/hci_packets.h

  LANG c++

  NAMESPACE "bluetooth::hci"

tools/rootcanal/rust/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ message(STATUS "Enabling bluetooth LMP module.") 


pdl_gen(

    NAME hci_packets_rs

    INPUT ${ROOTCANAL_ROOT}/packets/hci/hci_packets.pdl

    INPUT ${ROOTCANAL_ROOT}/packets/hci_packets.pdl

    OUTPUT hci_packets.rs

    LANG rust)

tools/rootcanal/rust/build.rs

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ fn main() { 
    install_generated_module(

        "hci_packets.rs",

        "HCI_PACKETS_PREBUILT",

        &PathBuf::from("../packets/hci/hci_packets.pdl").canonicalize().unwrap(),

        &PathBuf::from("../packets/hci_packets.pdl").canonicalize().unwrap(),

    );

}