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

Commit a517d8f8 authored by Wen Chang Liu's avatar Wen Chang Liu Committed by Chris Manton
Browse files

Revert "Re-point stack tests to use centralized test/mock" 

Revert submission 1738738
Bug: 191431228
Tag: #refactor
Test: gd/cert/run

Reason for revert: Test Cop test checking
Reverted Changes:
I97a6d10c9:test: Fix net_test_osi
Ib514252d0:Make stack_smp_test host runnable
I77e9a079c:Update test/mock_stack_acl
Ia8a2896ca:Canonicalize include pathnames
Ibc4d03fc1:Add test/mock_btif_bluetooth
Id4733a3af:Remove unused mocks
Ifebdb31ec:Re-point stack tests to use centralized test/mock

Change-Id: Id4977c229aedccb8ce4bf553e3db66272b9be116
parent 53962abc

system/stack/Android.bp

+10 −10
Original line number Diff line number Diff line
@@ -763,8 +763,8 @@ cc_test { 
        ":TestMockStackBtu",

        ":TestMockStackGap",

        ":TestMockStackGatt",

        ":TestMockStackL2cap",

        ":TestMockStackSmp",

        ":TestStackL2cap",

        "acl/acl.cc",

        "acl/ble_acl.cc",

        "acl/btm_acl.cc",
@@ -875,9 +875,9 @@ cc_test { 
        "packages/modules/Bluetooth/system/gd",

    ],

    srcs: crypto_toolbox_srcs + [

        ":TestMockStackL2cap",

        ":TestMockStackSdp",

        ":TestMockStackBtm",

        ":TestStackL2cap",

        ":TestStackSdp",

        ":TestStackBtm",

        ":TestStubLegacyTrace",

        "hid/hidd_api.cc",

        "hid/hidd_conn.cc",
@@ -935,10 +935,10 @@ cc_test { 
        ":TestMockLegacyHciCommands",

        ":TestMockMainShim",

        ":TestMockStackAcl",

        ":TestMockStackBtm",

        ":TestMockStackL2cap",

        ":TestMockStackMetrics",

        ":TestMockStackSmp",

        ":TestStackBtm",

        ":TestStackL2cap",

        ":TestMockStackMetrics",

        "btu/btu_hcif.cc",

        "btu/btu_task.cc",

        "test/stack_btu_test.cc",
@@ -995,11 +995,11 @@ cc_test { 
        ":TestMockLegacyHciCommands",

        ":TestMockMainShim",

        ":TestMockStackAcl",

        ":TestMockStackBtm",

        ":TestMockStackCryptotoolbox",

        ":TestMockStackL2cap",

        ":TestMockStackSdp",

        ":TestMockStackSmp",

        ":TestStackBtm",

        ":TestStackL2cap",

        ":TestStackSdp",

        "eatt/eatt.cc",

        "gatt/att_protocol.cc",

        "gatt/connection_manager.cc",

system/test/Android.bp

+9 −2
Original line number Diff line number Diff line
@@ -132,14 +132,21 @@ filegroup { 
}



filegroup {

  name: "TestMockStackSdp",

  name: "TestStackL2cap",

  srcs: [

      "mock/mock_stack_l2cap_*.cc",

  ],

}



filegroup {

  name: "TestStackSdp",

  srcs: [

      "mock/mock_stack_sdp*.cc",

  ],

}



filegroup {

  name: "TestMockStackBtm",

  name: "TestStackBtm",

  srcs: [

      "mock/mock_stack_btm*.cc",

  ],