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

Commit 02a0d2e0 authored by Etienne Ruffieux's avatar Etienne Ruffieux Committed by Automerger Merge Worker
Browse files

Merge "Edit apex name for new test suites." into tm-mainline-prod am: 34272436 

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



Change-Id: Ib6649e9cc8d83a940d4fa81b0f3c6d54b37fa20c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ed439425 34272436

framework/tests/unit/AndroidTest.xml

+1 −1
Original line number Diff line number Diff line
@@ -31,6 +31,6 @@ 
    <!-- Only run FrameworkBluetoothTests 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.google.android.bluetooth" />

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

    </object>

</configuration>

service/tests/AndroidTest.xml

+6 −0
Original line number Diff line number Diff line
@@ -27,4 +27,10 @@ 
        <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />

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

    </test>



    <!-- Only run FrameworkBluetoothTests 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>