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

Commit 7dea6a7c authored by Etienne Ruffieux's avatar Etienne Ruffieux Committed by Android (Google) Code Review
Browse files

Merge "Remove Bt framework and service test suites from MTS" into tm-mainline-prod

parents eca84c44 b558aede

framework/tests/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -26,6 +26,5 @@ android_test { 
    ],

    test_suites: [

        "general-tests",

        "mts-bluetooth",

    ],

}

framework/tests/AndroidTest.xml

+0 −6
Original line number Diff line number Diff line
@@ -29,10 +29,4 @@ 
        <option name="hidden-api-checks" value="false"/>

        <option name="runner" value="android.bluetooth.BluetoothTestRunner"/>

    </test>



    <!-- Only run BluetoothTests in MTS if the Bluetooth Mainline module is installed. -->

    <object type="module_controller"

            class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">

        <option name="mainline-module-package-name" value="com.android.btservices" />

    </object>

</configuration>

service/tests/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -76,6 +76,5 @@ android_test { 


    test_suites: [

        "general-tests",

        "mts-bluetooth",

    ],

}

service/tests/AndroidTest.xml

+0 −6
Original line number Diff line number Diff line
@@ -27,10 +27,4 @@ 
        <option name="runner" value="com.android.server.bluetooth.CustomTestRunner" />

        <option name="hidden-api-checks" value="false"/>

    </test>



    <!-- Only run ServiceBluetoothTests in MTS if the Bluetooth Mainline module is installed. -->

    <object type="module_controller"

            class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">

        <option name="mainline-module-package-name" value="com.android.btservices" />

    </object>

</configuration>