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

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

Merge changes Ica38a448,I526fb846 

* changes:
  Add namespace in bluetooth_packetgen
  Add multi file support for bluetooth_packetgen
parents b231ddd9 8065543a

system/gd/Android.bp

+18 −3
Original line number Diff line number Diff line
@@ -108,8 +108,7 @@ cc_test { 
        ":BluetoothPacketTestSources",

    ],

    generated_headers : [

        "BluetoothHciGeneratedPackets_h",

        "BluetoothL2capGeneratedPackets_h",

        "BluetoothGeneratedPackets_h",

    ],

    static_libs : [

        "libbluetooth_gd",
@@ -152,3 +151,19 @@ cc_benchmark { 
        "libbluetooth_gd",

    ],

}



genrule {

    name: "BluetoothGeneratedPackets_h",

    tools: [

        "bluetooth_packetgen",

    ],

    cmd: "$(location bluetooth_packetgen) --include=packages/modules/Bluetooth/system/gd --out=$(genDir) $(in)",

    srcs: [

        "hci/hci_packets.pdl",

        "l2cap/l2cap_packets.pdl",

    ],

    out: [

        "hci/hci_packets.h",

        "l2cap/l2cap_packets.h",

    ],

}

system/gd/hci/Android.bp

+0 −14
Original line number Diff line number Diff line 
genrule {

    name: "BluetoothHciGeneratedPackets_h",

    tools: [

        "bluetooth_packetgen",

    ],

    cmd: "mkdir -p $(genDir)/hci/; $(location bluetooth_packetgen) < $(in) > $(genDir)/hci/generated_packets.h 2>/dev/null",

    srcs: [

        "hci.pdl",

    ],

    out: [

        "hci/generated_packets.h",

    ],

}



filegroup {

    name: "BluetoothHciTestSources",

    srcs: [

system/gd/hci/acl_builder_test.cc

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



#include "hci/generated_packets.h"

#include "hci/hci_packets.h"



#include <gtest/gtest.h>

#include <forward_list>

system/gd/hci/hci.pdl→system/gd/hci/hci_packets.pdl

+0 −0

File moved.

View file

system/gd/l2cap/Android.bp

+0 −14
Original line number Diff line number Diff line 
genrule {

    name: "BluetoothL2capGeneratedPackets_h",

    tools: [

        "bluetooth_packetgen",

    ],

    cmd: "mkdir -p $(genDir)/l2cap/; $(location bluetooth_packetgen) < $(in) > $(genDir)/l2cap/generated_packets.h 2>/dev/null",

    srcs: [

        "l2cap.pdl",

    ],

    out: [

        "l2cap/generated_packets.h",

    ],

}



filegroup {

    name: "BluetoothL2capTestSources",

    srcs: [