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

Commit 4204a822 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

mock: Split stack manager entry from rest of shim am: 3aff6467 am: bbfc9e60 

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



Change-Id: I42f151c82a7ce383c164183e211b379dd791ea3a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6ecf40d6 bbfc9e60

system/bta/Android.bp

+5 −0
Original line number Diff line number Diff line
@@ -237,6 +237,7 @@ cc_test { 
        ":TestMockBtif",

        ":TestMockDevice",

        ":TestMockMainShim",

        ":TestMockMainShimEntry",

        ":TestMockStackA2dp",

        ":TestMockStackAcl",

        ":TestMockStackAvct",
@@ -333,6 +334,7 @@ cc_test { 
        ":TestMockBtif",

        ":TestMockDevice",

        ":TestMockMainShim",

        ":TestMockMainShimEntry",

        ":TestMockStackBtm",

        ":TestMockStackL2cap",

        ":TestMockStackMetrics",
@@ -828,6 +830,7 @@ cc_test { 
        ":TestCommonMockFunctions",

        ":TestMockBtaLeAudioHalVerifier",

        ":TestMockMainShim",

        ":TestMockMainShimEntry",

        ":TestMockStackL2cap",

        ":TestStubOsi",

        "le_audio/audio_hal_client/audio_hal_client_test.cc",
@@ -921,6 +924,7 @@ cc_test { 
        ":TestCommonMockFunctions",

        ":TestMockBtaLeAudioHalVerifier",

        ":TestMockMainShim",

        ":TestMockMainShimEntry",

        ":TestMockStackL2cap",

        ":TestStubOsi",

        "gatt/database.cc",
@@ -1225,6 +1229,7 @@ cc_test { 
        ":TestMockBtif",

        ":TestMockDevice",

        ":TestMockMainShim",

        ":TestMockMainShimEntry",

        ":TestMockOsi",

        ":TestMockStack",

        "gatt/bta_gattc_queue.cc",

system/btif/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -613,6 +613,7 @@ cc_test { 
        ":TestMockBtu",

        ":TestMockHci",

        ":TestMockMainShim",

        ":TestMockMainShimEntry",

        ":TestMockStack",

        ":TestMockUdrv",

        "test/btif_hh_test.cc",
@@ -736,6 +737,7 @@ cc_test { 
        ":TestMockBtu",

        ":TestMockHci",

        ":TestMockMainShim",

        ":TestMockMainShimEntry",

        ":TestMockStack",

        ":TestMockUdrv",

        "test/btif_core_test.cc",

system/stack/Android.bp

+13 −0
Original line number Diff line number Diff line
@@ -438,6 +438,7 @@ cc_fuzz { 
        ":TestMockDevice",

        ":TestMockGdOsLoggingLogRedaction",

        ":TestMockMainShim",

        ":TestMockMainShimEntry",

        ":TestMockRustFfi",

        ":TestMockSrvcDis",

        ":TestMockStackAcl",
@@ -492,6 +493,7 @@ cc_fuzz { 
        ":TestMockDevice",

        ":TestMockGdOsLoggingLogRedaction",

        ":TestMockMainShim",

        ":TestMockMainShimEntry",

        ":TestMockStackAcl",

        ":TestMockStackBtm",

        ":TestMockStackHcic",
@@ -541,6 +543,7 @@ cc_fuzz { 
        ":TestMockDevice",

        ":TestMockGdOsLoggingLogRedaction",

        ":TestMockMainShim",

        ":TestMockMainShimEntry",

        ":TestMockStackAcl",

        ":TestMockStackBtm",

        ":TestMockStackHcic",
@@ -585,6 +588,7 @@ cc_fuzz { 
        ":TestMockDevice",

        ":TestMockGdOsLoggingLogRedaction",

        ":TestMockMainShim",

        ":TestMockMainShimEntry",

        ":TestMockStackAcl",

        ":TestMockStackBtm",

        ":TestMockStackHcic",
@@ -633,6 +637,7 @@ cc_fuzz { 
        ":TestMockDevice",

        ":TestMockGdOsLoggingLogRedaction",

        ":TestMockMainShim",

        ":TestMockMainShimEntry",

        ":TestMockStackAcl",

        ":TestMockStackBtm",

        ":TestMockStackHcic",
@@ -773,6 +778,7 @@ cc_test { 
        ":TestCommonMockFunctions",

        ":TestMockHci",

        ":TestMockMainShim",

        ":TestMockMainShimEntry",

        ":TestMockStackMetrics",

        "rfcomm/port_api.cc",

        "rfcomm/port_rfc.cc",
@@ -860,6 +866,7 @@ cc_test { 
        ":TestMockBtif",

        ":TestMockDevice",

        ":TestMockMainShim",

        ":TestMockMainShimEntry",

        ":TestMockStackAcl",

        ":TestMockStackBtm",

        ":TestMockStackHcic",
@@ -1382,6 +1389,7 @@ cc_test { 
        ":TestCommonMockFunctions",

        ":TestCommonStackConfig",

        ":TestMockMainShim",

        ":TestMockMainShimEntry",

        "btm/btm_iso.cc",

        "test/btm_iso_test.cc",

        "test/common/mock_controller.cc",
@@ -1523,6 +1531,7 @@ cc_test { 
        ":TestMockLegacyHciInterface",

        ":TestMockMainBte",

        ":TestMockMainShim",

        ":TestMockMainShimEntry",

        ":TestMockRustFfi",

        ":TestMockStackBtu",

        ":TestMockStackGap",
@@ -1763,6 +1772,7 @@ cc_test { 
        ":TestMockHci",

        ":TestMockLegacyHciCommands",

        ":TestMockMainShim",

        ":TestMockMainShimEntry",

        ":TestMockStackAcl",

        ":TestMockStackBtm",

        ":TestMockStackHcic",
@@ -1838,6 +1848,7 @@ cc_test { 
        ":TestMockHci",

        ":TestMockLegacyHciCommands",

        ":TestMockMainShim",

        ":TestMockMainShimEntry",

        ":TestMockRustFfi",

        ":TestMockSrvcDis",

        ":TestMockStackAcl",
@@ -1938,6 +1949,7 @@ cc_test { 
        ":TestMockJni",

        ":TestMockLegacyHciCommands",

        ":TestMockMainShim",

        ":TestMockMainShimEntry",

        ":TestMockStackAcl",

        ":TestMockStackBtm",

        ":TestMockStackHcic",
@@ -2031,6 +2043,7 @@ cc_test { 
        ":TestMockLegacyHciCommands",

        ":TestMockLegacyHciInterface",

        ":TestMockMainShim",

        ":TestMockMainShimEntry",

        ":TestMockRustFfi",

        ":TestMockStackBtm",

        ":TestMockStackBtu",

system/test/Android.bp

+15 −1
Original line number Diff line number Diff line
@@ -190,7 +190,21 @@ filegroup { 
filegroup {

    name: "TestMockMainShim",

    srcs: [

        "mock/mock_main_shim*.cc",

        "mock/mock_main_shim.cc",

        "mock/mock_main_shim_BtifConfigInterface.cc",

        "mock/mock_main_shim_acl.cc",

        "mock/mock_main_shim_acl_api.cc",

        "mock/mock_main_shim_acl_legacy_interface.cc",

        "mock/mock_main_shim_btm_api.cc",

        "mock/mock_main_shim_controller.cc",

        "mock/mock_main_shim_distance_measurement_manager.cc",

        "mock/mock_main_shim_dumpsys.cc",

        "mock/mock_main_shim_hci_layer.cc",

        "mock/mock_main_shim_l2cap_api.cc",

        "mock/mock_main_shim_le_advertising_manager.cc",

        "mock/mock_main_shim_le_scanning_manager.cc",

        "mock/mock_main_shim_metric_id_api.cc",

        "mock/mock_main_shim_metrics_api.cc",

    ],

}