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

Commit 62e99815 authored by Myles Watson's avatar Myles Watson Committed by Automerger Merge Worker
Browse files

Merge "Use PDL libraries in main/ rust/ and stack/" into main am: 992ad685 

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



Change-Id: Ie5f5d6d9eeb79547d74351cd4d2cd780925ce81d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3f111293 992ad685

system/gd/cert/bluetooth_packets_python3_setup.py

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ PYBIND11_INCLUDE_DIR = os.path.join(ANDROID_BUILD_TOP, "external/python/pybind11 
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")

    "out/soong/.intermediates/packages/modules/Bluetooth/system/pdl/l2cap/BluetoothGeneratedPacketsL2cap_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/main/Android.bp

+1 −3
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ cc_library_static { 
    generated_headers: [

        "BluetoothGeneratedBundlerSchema_h_bfbs",

        "BluetoothGeneratedDumpsysDataSchema_h",

        "BluetoothGeneratedPackets_h",

    ],

    apex_available: [

        "com.android.btservices",
@@ -143,7 +142,6 @@ cc_library_static { 
    generated_headers: [

        "BluetoothGeneratedBundlerSchema_h_bfbs",

        "BluetoothGeneratedDumpsysDataSchema_h",

        "BluetoothGeneratedPackets_h",

    ],

    cflags: [

        "-DBUILDCFG",
@@ -216,6 +214,7 @@ cc_test { 
        "libbluetooth-dumpsys",

        "libbluetooth-types",

        "libbluetooth_gd",

        "libbluetooth_hci_pdl",

        "libbt-common",

        "libbt-platform-protos-lite",

        "libbt_shim_bridge",
@@ -244,7 +243,6 @@ cc_test { 
    generated_headers: [

        "BluetoothGeneratedBundlerSchema_h_bfbs",

        "BluetoothGeneratedDumpsysDataSchema_h",

        "BluetoothGeneratedPackets_h",

    ],

    min_sdk_version: "Tiramisu",

    header_libs: ["libbluetooth_headers"],

system/pdl/Android.bp

+0 −20
Original line number Diff line number Diff line
@@ -29,23 +29,3 @@ genrule { 
        "l2cap/l2cap_packets_python3_shard_9.cc",

    ],

}
 


// TODO replace progressivly by the appropriate static libs

genrule {

    name: "BluetoothGeneratedPackets_h",

    tools: [

        "bluetooth_packetgen",

    ],

    cmd: "$(location bluetooth_packetgen) --fuzzing --testing --include=packages/modules/Bluetooth/system/pdl --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"],

}

system/rust/Android.bp

+1 −2
Original line number Diff line number Diff line
@@ -125,9 +125,9 @@ cc_library_static { 
    ],

    export_include_dirs: ["."],

    static_libs: [

        "libbluetooth_hci_pdl",

        "libbt_shim_bridge",

        "libbt_shim_ffi",



        "libchrome",

        "libflatbuffers-cpp",

    ],
@@ -137,7 +137,6 @@ cc_library_static { 


        "BluetoothGeneratedBundlerSchema_h_bfbs",

        "BluetoothGeneratedDumpsysDataSchema_h",

        "BluetoothGeneratedPackets_h",

    ],

    export_generated_headers: [

        "libbluetooth_core_rs_bridge_codegen_header",

system/stack/Android.bp

+23 −14
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ cc_library_static { 
    ],

    generated_headers: [

        "BluetoothGeneratedDumpsysDataSchema_h",

        "BluetoothGeneratedPackets_h",

    ],

    srcs: crypto_toolbox_srcs + [

        "a2dp/a2dp_aac.cc",
@@ -136,6 +135,7 @@ cc_library_static { 
        "pan/pan_utils.cc",

    ],

    static_libs: [

        "libbluetooth_hci_pdl",

        "libbt-hci",

        "libbt-platform-protos-lite",

        "libbt-stack-core",
@@ -283,7 +283,6 @@ cc_library_static { 
    ],

    generated_headers: [

        "BluetoothGeneratedDumpsysDataSchema_h",

        "BluetoothGeneratedPackets_h",

    ],

    cflags: [

        "-Wno-unused-parameter",
@@ -293,6 +292,7 @@ cc_library_static { 
    static_libs: [

        "libbluetooth_core_rs",

        "libbluetooth_gd",

        "libbluetooth_hci_pdl",

        "libbt-hci",

        "libbt-platform-protos-lite",

        "libbt_shim_bridge",
@@ -420,7 +420,6 @@ cc_fuzz { 
    ],

    generated_headers: [

        "BluetoothGeneratedDumpsysDataSchema_h",

        "BluetoothGeneratedPackets_h",

    ],

    srcs: crypto_toolbox_srcs + [

        ":TestCommonLogMsg",
@@ -446,6 +445,9 @@ cc_fuzz { 
    ],

    static_libs: [

        "libbluetooth-types",

        "libbluetooth_hci_pdl",

        "libbluetooth_l2cap_pdl",

        "libbluetooth_smp_pdl",

        "libbt-platform-protos-lite",

        "libbt_shim_bridge",

        "libbt_shim_ffi",
@@ -466,7 +468,6 @@ cc_fuzz { 
    ],

    generated_headers: [

        "BluetoothGeneratedDumpsysDataSchema_h",

        "BluetoothGeneratedPackets_h",

    ],

    srcs: crypto_toolbox_srcs + [

        ":TestCommonLogMsg",
@@ -487,6 +488,9 @@ cc_fuzz { 
    ],

    static_libs: [

        "libbluetooth-types",

        "libbluetooth_hci_pdl",

        "libbluetooth_l2cap_pdl",

        "libbluetooth_smp_pdl",

        "libbt-platform-protos-lite",

        "libbt_shim_bridge",

        "libbt_shim_ffi",
@@ -507,7 +511,6 @@ cc_fuzz { 
    ],

    generated_headers: [

        "BluetoothGeneratedDumpsysDataSchema_h",

        "BluetoothGeneratedPackets_h",

    ],

    srcs: [

        ":TestCommonLogMsg",
@@ -528,6 +531,9 @@ cc_fuzz { 
    ],

    static_libs: [

        "libbluetooth-types",

        "libbluetooth_hci_pdl",

        "libbluetooth_l2cap_pdl",

        "libbluetooth_smp_pdl",

        "libbt-platform-protos-lite",

        "libbt_shim_bridge",

        "libbt_shim_ffi",
@@ -548,7 +554,6 @@ cc_fuzz { 
    ],

    generated_headers: [

        "BluetoothGeneratedDumpsysDataSchema_h",

        "BluetoothGeneratedPackets_h",

    ],

    srcs: [

        ":TestCommonLogMsg",
@@ -571,6 +576,9 @@ cc_fuzz { 
    ],

    static_libs: [

        "libbluetooth-types",

        "libbluetooth_hci_pdl",

        "libbluetooth_l2cap_pdl",

        "libbluetooth_smp_pdl",

        "libbt-platform-protos-lite",

        "libbt_shim_bridge",

        "libbt_shim_ffi",
@@ -599,7 +607,6 @@ cc_fuzz { 
    ],

    generated_headers: [

        "BluetoothGeneratedDumpsysDataSchema_h",

        "BluetoothGeneratedPackets_h",

    ],

    srcs: [

        ":TestCommonLogMsg",
@@ -619,6 +626,9 @@ cc_fuzz { 
    ],

    static_libs: [

        "libbluetooth-types",

        "libbluetooth_hci_pdl",

        "libbluetooth_l2cap_pdl",

        "libbluetooth_smp_pdl",

        "libbt-platform-protos-lite",

        "libbt_shim_bridge",

        "libbt_shim_ffi",
@@ -763,7 +773,6 @@ cc_test { 
    ],

    generated_headers: [

        "BluetoothGeneratedDumpsysDataSchema_h",

        "BluetoothGeneratedPackets_h",

    ],

    shared_libs: [

        "libcrypto",
@@ -772,6 +781,9 @@ cc_test { 
    static_libs: [

        "libbluetooth-types",

        "libbluetooth_gd",

        "libbluetooth_hci_pdl",

        "libbluetooth_l2cap_pdl",

        "libbluetooth_smp_pdl",

        "libbt-common",

        "libbt-platform-protos-lite",

        "libbt_shim_bridge",
@@ -847,7 +859,6 @@ cc_test { 
    ],

    generated_headers: [

        "BluetoothGeneratedDumpsysDataSchema_h",

        "BluetoothGeneratedPackets_h",

    ],

    shared_libs: [

        "libcrypto",
@@ -856,6 +867,9 @@ cc_test { 
    static_libs: [

        "libbluetooth-types",

        "libbluetooth_gd",

        "libbluetooth_hci_pdl",

        "libbluetooth_l2cap_pdl",

        "libbluetooth_smp_pdl",

        "libbt-platform-protos-lite",

        "libbt_shim_bridge",

        "libbt_shim_ffi",
@@ -1444,7 +1458,6 @@ cc_test { 
    ],

    generated_headers: [

        "BluetoothGeneratedDumpsysDataSchema_h",

        "BluetoothGeneratedPackets_h",

    ],

    srcs: crypto_toolbox_srcs + [

        ":BluetoothHalSources_hci_host",
@@ -1685,7 +1698,6 @@ cc_test { 
    ],

    generated_headers: [

        "BluetoothGeneratedDumpsysDataSchema_h",

        "BluetoothGeneratedPackets_h",

    ],

    srcs: [

        ":TestCommonLogMsg",
@@ -1757,7 +1769,6 @@ cc_test { 
    ],

    generated_headers: [

        "BluetoothGeneratedDumpsysDataSchema_h",

        "BluetoothGeneratedPackets_h",

    ],

    srcs: [

        ":OsiCompatSources",
@@ -1852,7 +1863,6 @@ cc_test { 
    ],

    generated_headers: [

        "BluetoothGeneratedDumpsysDataSchema_h",

        "BluetoothGeneratedPackets_h",

    ],

    srcs: [

        ":OsiCompatSources",
@@ -1943,7 +1953,6 @@ cc_test { 
    ],

    generated_headers: [

        "BluetoothGeneratedDumpsysDataSchema_h",

        "BluetoothGeneratedPackets_h",

    ],

    srcs: [

        ":OsiCompatSources",