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

Commit 325cbc62 authored by Chris Manton's avatar Chris Manton
Browse files

Split out stack manager sources from shim 

Bug: 324321219
Test: m .
Test: EXEMPT, infrastructure build and test

Change-Id: Ia34541e6e90a3d6b7523fab78d395647f3d05835
parent 33606294

system/btif/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -619,6 +619,7 @@ cc_test { 
        "test/btif_hh_test.cc",

    ],

    generated_headers: [

        "BluetoothGeneratedBundlerSchema_h_bfbs",

        "BluetoothGeneratedDumpsysDataSchema_h",

    ],

    header_libs: ["libbluetooth_headers"],
@@ -743,6 +744,7 @@ cc_test { 
        "test/btif_core_test.cc",

    ],

    generated_headers: [

        "BluetoothGeneratedBundlerSchema_h_bfbs",

        "BluetoothGeneratedDumpsysDataSchema_h",

    ],

    header_libs: ["libbluetooth_headers"],

system/gd/dumpsys/bundler/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ filegroup { 
genrule {

    name: "BluetoothGeneratedBundlerSchema_h_bfbs",

    visibility: [

        "//packages/modules/Bluetooth/system/btif",

        "//packages/modules/Bluetooth/system/gd",

        "//packages/modules/Bluetooth/system/main",

        "//packages/modules/Bluetooth/system/rust",

system/main/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ cc_library_static { 
    name: "libbte",

    defaults: ["fluoride_defaults"],

    srcs: [

        ":BluetoothStackManagerSources",

        ":LibBluetoothShimSources",

        ":LibBluetoothSources",

    ],
@@ -125,6 +126,7 @@ cc_library_static { 
    defaults: ["fluoride_defaults"],



    srcs: [

        ":BluetoothStackManagerSources",

        ":LibBluetoothShimSources",

        ":LibBluetoothSources",

    ],

system/main/BUILD.gn

+1 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ target(lib_type, "bluetooth") { 
    "//bt/system/gd:libbluetooth_gd",

    "//bt/system/log:libbluetooth_log",

    "//bt/system/hci",

    "//bt/system/main/shim:BluetoothStackManagerSources",

    "//bt/system/main/shim:LibBluetoothShimSources",

    "//bt/system/osi",

    "//bt/system/packet",

system/main/shim/Android.bp

+8 −2
Original line number Diff line number Diff line
@@ -7,6 +7,14 @@ package { 
    default_applicable_licenses: ["system_bt_license"],

}



filegroup {

    name: "BluetoothStackManagerSources",

    srcs: [

        "entry.cc",

        "stack.cc",

    ],

}



filegroup {

    name: "LibBluetoothShimSources",

    srcs: [
@@ -19,7 +27,6 @@ filegroup { 
        "controller.cc",

        "distance_measurement_manager.cc",

        "dumpsys.cc",

        "entry.cc",

        "hci_layer.cc",

        "l2c_api.cc",

        "le_advertising_manager.cc",
@@ -27,7 +34,6 @@ filegroup { 
        "metric_id_api.cc",

        "metrics_api.cc",

        "shim.cc",

        "stack.cc",

        "utils.cc",

    ],

}