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

Commit 8c8f2de3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "pdl: Merge script/ and scripts/ subfolders" am: 12b0eb17 

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



Change-Id: I2814c6e4896dd85fb8e4dc720f25f33b2259101b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 202baa2c 12b0eb17

tools/pdl/Android.bp

+20 −0
Original line number Diff line number Diff line
@@ -33,6 +33,12 @@ rust_binary_host { 
    defaults: ["pdl_defaults"],

}



python_binary_host {

    name: "pypdl",

    main: "scripts/pdl/parser.py",

    srcs: ["scripts/pdl/parser.py"],

}



rust_test_host {

    name: "pdl_inline_tests",

    defaults: ["pdl_defaults"],
@@ -139,3 +145,17 @@ python_test_host { 
        unit_test: true,

    },

}



// Test the python parser against the rust parser

// on selected PDL source files.

python_test_host {

    name: "pdl_python_parser_test",

    main: "tests/python_parser_test.py",

    srcs: ["tests/python_parser_test.py"],

    data: [

        ":pdl",

        ":pypdl",

        ":BluetoothHciPackets",

        ":RootCanalLinkLayerPackets",

    ],

}

tools/pdl/script/Android.bp

deleted100644 → 0
+0 −35
Original line number Diff line number Diff line 
// Copyright 2022 Google Inc. All rights reserved.

//

// 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.



package {

    default_applicable_licenses: ["Android-Apache-2.0"],

}



python_binary_host {

    name: "pypdl",

    main: "pdl.py",

    srcs: ["pdl.py"],

}



python_test_host {

    name: "pypdl_test",

    main: "pdl_test.py",

    srcs: ["pdl_test.py"],

    data: [

        ":pdl",

        ":pypdl",

        ":BluetoothHciPackets",

        ":RootCanalLinkLayerPackets",

    ],

}

tools/pdl/script/pdl.py→tools/pdl/scripts/pdl/parser.py

+0 −0

File moved.

View file

tools/pdl/script/pdl_test.py→tools/pdl/tests/python_parser_test.py

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ FILES_TO_TEST = [ 
    'packets/link_layer_packets.pdl',

]



test_dir = os.path.dirname(__file__)

test_dir = os.path.dirname(os.path.dirname(__file__))

pdl_bin = os.path.join(test_dir, 'pdl')

pypdl_bin = os.path.join(test_dir, 'pypdl')