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

Commit 011f6a73 authored by Chris Manton's avatar Chris Manton
Browse files

Separate out legacy shim sources 

Granularize the make dependencies

Test: bluetooth_test_legacy
Bug: 146086425

Change-Id: I8c7a8c070d7a84527770a66ca66af9b07bc83b3a
parent 7eff9ef7

system/main/Android.bp

+4 −18
Original line number Diff line number Diff line
@@ -8,14 +8,6 @@ filegroup { 
        "bte_init_cpp_logging.cc",

        "bte_logmsg.cc",

        "bte_main.cc",

        "shim/btm.cc",

        "shim/btm_api.cc",

        "shim/controller.cc",

        "shim/entry.cc",

        "shim/hci_layer.cc",

        "shim/l2c_api.cc",

        "shim/l2cap.cc",

        "shim/shim.cc",

        "stack_config.cc",

    ]

}
@@ -27,6 +19,7 @@ cc_library_shared { 
    export_header_lib_headers: ["libbluetooth_headers"],

    srcs: [

        ":LibBluetoothSources",

        ":LibBluetoothShimSources",

    ],

    include_dirs: [

        "packages/modules/Bluetooth/system",
@@ -119,7 +112,8 @@ cc_library_static { 


    srcs: [

        ":LibBluetoothSources",

        "shim/entry_for_test.cc",

        ":LibBluetoothShimSources",

        ":LibBluetoothShimTestEntrySources",

    ],

    host_supported: true,

    include_dirs: [
@@ -137,14 +131,6 @@ cc_library_static { 
    ],

}



filegroup {

    name: "BluetoothLegacyShimTestSources",

    srcs: [

        "shim/l2cap_test.cc",

        "shim/test_stack.cc",

    ]

}



cc_test {

    name: "bluetooth_test_legacy",

    defaults: ["fluoride_defaults",
@@ -153,7 +139,7 @@ cc_test { 
    test_suites: ["device-tests"],

    host_supported: true,

    srcs: [

        ":BluetoothLegacyShimTestSources",

        ":LibBluetoothShimTestSources",

    ],

    static_libs: [

        "libgmock",

system/main/shim/Android.bp

0 → 100644
+30 −0
Original line number Diff line number Diff line 
filegroup {

    name: "LibBluetoothShimSources",

    srcs: [

        "btm.cc",

        "btm_api.cc",

        "controller.cc",

        "entry.cc",

        "hci_layer.cc",

        "l2c_api.cc",

        "l2cap.cc",

        "shim.cc",

    ]

}



filegroup {

    name: "LibBluetoothShimTestSources",

    srcs: [

        "l2cap_test.cc",

        "test_stack.cc",

    ]

}



// Stubbed out fake entry point for the gd stack

filegroup {

    name: "LibBluetoothShimTestEntrySources",

    srcs: [

        "entry_for_test.cc",

    ]

}