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

Commit 4e304b91 authored by William Escande's avatar William Escande Committed by Myles Watson
Browse files

Use libraries to track PDL-generated packet files 

NO_IFTTT= changing the path for the sources doesn't change the gd_device
Bug: 296427840
Test: mma -j32
Change-Id: I2be7877229972584fe692c0541f957cfdf25b6cf
Merged-In: I2be7877229972584fe692c0541f957cfdf25b6cf
parent 2822ca01

system/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -19,10 +19,10 @@ LOCAL_host_executables := \ 
	$(HOST_OUT_EXECUTABLES)/root-canal



LOCAL_host_python_hci_packets_library := \

	$(SOONG_OUT_DIR)/.intermediates/packages/modules/Bluetooth/system/gd/gd_hci_packets_python3_gen/gen/hci_packets.py

	$(SOONG_OUT_DIR)/.intermediates/packages/modules/Bluetooth/system/pdl/hci/gd_hci_packets_python3_gen/gen/hci_packets.py



LOCAL_host_python_smp_packets_library := \

	$(SOONG_OUT_DIR)/.intermediates/packages/modules/Bluetooth/system/gd/gd_smp_packets_python3_gen/gen/smp_packets.py

	$(SOONG_OUT_DIR)/.intermediates/packages/modules/Bluetooth/system/pdl/security/gd_smp_packets_python3_gen/gen/smp_packets.py



LOCAL_host_python_extension_libraries := \

	$(HOST_OUT_SHARED_LIBRARIES)/bluetooth_packets_python3.so

system/gd/Android.bp

+6 −84
Original line number Diff line number Diff line
@@ -156,7 +156,6 @@ cc_defaults { 
    generated_headers: [

        "BluetoothGeneratedBundlerSchema_h_bfbs",

        "BluetoothGeneratedDumpsysDataSchema_h",

        "BluetoothGeneratedPackets_h",

    ],

    shared_libs: [

        "libcrypto",
@@ -166,6 +165,9 @@ cc_defaults { 
        "libflatbuffers-cpp",

    ],

    whole_static_libs: [

        "libbluetooth_hci_pdl",

        "libbluetooth_l2cap_pdl",

        "libbluetooth_smp_pdl",

        "libc++fs",

    ],

    static_libs: [
@@ -221,7 +223,9 @@ cc_library { 
    cflags: [

        "-DUSE_FAKE_TIMERS",

    ],

    static_libs: ["libchrome"],

    static_libs: [

        "libchrome",

    ],

}



cc_binary {
@@ -563,32 +567,6 @@ filegroup { 
    ],

}



genrule {

    name: "BluetoothGeneratedPackets_h",

    tools: [

        "bluetooth_packetgen",

    ],

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

    srcs: [

        "hci/hci_packets.pdl",

        "l2cap/l2cap_packets.pdl",

        "security/smp_packets.pdl",

    ],

    out: [

        "hci/hci_packets.h",

        "l2cap/l2cap_packets.h",

        "security/smp_packets.h",

    ],

    visibility: ["//visibility:public"],

}



genrule {

    name: "BluetoothGeneratedPackets_rust",

    defaults: ["pdl_rust_generator_defaults"],

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

    out: ["hci/hci_packets.rs"],

}



rust_library {

    name: "libbt_packets",

    defaults: ["gd_rust_defaults"],
@@ -693,30 +671,6 @@ genrule { 
    ],

}



genrule {

    name: "BluetoothGeneratedPackets_python3_cc",

    tools: [

        "bluetooth_packetgen",

    ],

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

    srcs: [

        "l2cap/l2cap_packets.pdl",

    ],

    out: [

        "l2cap/l2cap_packets_python3.cc",

        "l2cap/l2cap_packets_python3_shard_0.cc",

        "l2cap/l2cap_packets_python3_shard_1.cc",

        "l2cap/l2cap_packets_python3_shard_2.cc",

        "l2cap/l2cap_packets_python3_shard_3.cc",

        "l2cap/l2cap_packets_python3_shard_4.cc",

        "l2cap/l2cap_packets_python3_shard_5.cc",

        "l2cap/l2cap_packets_python3_shard_6.cc",

        "l2cap/l2cap_packets_python3_shard_7.cc",

        "l2cap/l2cap_packets_python3_shard_8.cc",

        "l2cap/l2cap_packets_python3_shard_9.cc",

    ],

}



cc_defaults {

    name: "bluetooth_py3_native_extension_defaults",

    include_dirs: [
@@ -819,35 +773,3 @@ cc_library_host_shared { 
    ],

    rtti: true,

}
 


// Generate the python parser+serializer backend for

// hci_packets.pdl.

genrule {

    name: "gd_hci_packets_python3_gen",

    defaults: ["pdl_python_generator_defaults"],

    cmd: "$(location :pdlc) $(in) |" +

        " $(location :pdl_python_generator)" +

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

    srcs: [

        ":BluetoothHciPackets",

    ],

    out: [

        "hci_packets.py",

    ],

}



// Generate the python parser+serializer backend for

// smp_packets.pdl.

genrule {

    name: "gd_smp_packets_python3_gen",

    defaults: ["pdl_python_generator_defaults"],

    cmd: "$(location :pdlc) $(in) |" +

        " $(location :pdl_python_generator)" +

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

    srcs: [

        "security/smp_packets.pdl",

    ],

    out: [

        "smp_packets.py",

    ],

}

system/gd/BUILD.gn

+2 −25
Original line number Diff line number Diff line
@@ -46,9 +46,9 @@ group("gd_default_deps") { 
  deps = [

    "//bt/system:libbt-platform-protos-lite",

    "//bt/system/gd:BluetoothGeneratedDumpsysDataSchema_h",

    "//bt/system/gd:BluetoothGeneratedPackets_h",

    "//bt/system/gd/dumpsys:libbluetooth-dumpsys",

    "//bt/system/gd/rust/shim:init_flags_bridge_header",

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

  ]

}
@@ -64,7 +64,6 @@ static_library("libbluetooth_gd") { 
    "//bt/system/gd/rust/common:libbt_keystore_cc",

    "//bt/system/gd/rust/topshim:libbluetooth_topshim",

    "//bt/system/gd/rust/shim:libbluetooth_rust_interop",

    "//bt/system/gd:BluetoothGeneratedPackets_h",

    "//bt/system/gd/att:BluetoothAttSources",

    "//bt/system/gd/common:BluetoothCommonSources",

    "//bt/system/gd/crypto_toolbox:BluetoothCryptoToolboxSources",
@@ -79,6 +78,7 @@ static_library("libbluetooth_gd") { 
    "//bt/system/gd/shim:BluetoothShimSources",

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

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

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

  ]

}
@@ -109,26 +109,3 @@ bt_flatc_binary_schema("BluetoothGeneratedDumpsysBinarySchema_bfbs") { 


  include_dir = "system/gd"

}
 


packetgen_py("BluetoothGeneratedPackets_python3_cc") {

  sources = [

    "hci/hci_packets.pdl",

    "l2cap/l2cap_packets.pdl",

    "security/smp_packets.pdl",

  ]



  include = "system/gd"

  source_root = "../.."

  shards = 10

}



packetgen_headers("BluetoothGeneratedPackets_h") {

  sources = [

    "hci/hci_packets.pdl",

    "l2cap/l2cap_packets.pdl",

    "security/smp_packets.pdl",

  ]



  include = "system/gd"

  source_root = "../.."

}

system/gd/cert/bluetooth_packets_python3_setup.py

+2 −1
Original line number Diff line number Diff line
@@ -32,7 +32,8 @@ ANDROID_BUILD_TOP = os.getenv("ANDROID_BUILD_TOP") 
PYBIND11_INCLUDE_DIR = os.path.join(ANDROID_BUILD_TOP, "external/python/pybind11/include")

GD_DIR = os.path.join(ANDROID_BUILD_TOP, "packages/modules/Bluetooth/system/gd")

BT_PACKETS_GEN_DIR = os.path.join(

    ANDROID_BUILD_TOP, "out/soong/.intermediates/packages/modules/Bluetooth/system/gd/BluetoothGeneratedPackets_h/gen")

    ANDROID_BUILD_TOP,

    "out/soong/.intermediates/packages/modules/Bluetooth/system/gd/BluetoothGeneratedPackets_h/gen")

BT_PACKETS_PY3_GEN_DIR = os.path.join(

    ANDROID_BUILD_TOP,

    "out/soong/.intermediates/packages/modules/Bluetooth/system/gd/BluetoothGeneratedPackets_python3_cc/gen")

system/gd/hci/Android.bp

+0 −17
Original line number Diff line number Diff line
@@ -7,19 +7,9 @@ package { 
    default_applicable_licenses: ["system_bt_license"],

}



filegroup {

    name: "BluetoothHciPacketSources",

    srcs: [

        "address.cc",

        "class_of_device.cc",

    ],

    visibility: ["//visibility:public"],

}



filegroup {

    name: "BluetoothHciSources",

    srcs: [

        ":BluetoothHciPacketSources",

        "acl_manager.cc",

        "acl_manager/acl_connection.cc",

        "acl_manager/acl_fragmenter.cc",
@@ -103,10 +93,3 @@ filegroup { 
        "fuzz/status_vs_complete_commands.cc",

    ],

}
 


filegroup {

    name: "BluetoothHciPackets",

    srcs: [

        "hci_packets.pdl",

    ],

}