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

Commit 1074b77e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update bluetooth mts tag to bt" into main am: 23ed363b 

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



Change-Id: Ifcdbe0261688fc4efbfcfe335603c07ad77c01c3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents becacf70 23ed363b

android/app/tests/unit/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ java_defaults { 
        "automotive-general-tests",

        "general-tests",

        "mts-bluetooth",

        "mts-bt",

    ],



    instrumentation_for: "Bluetooth",

android/pandora/gen_cov.py

+2 −2
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ import subprocess 
import sys

import xml.etree.ElementTree as ET



JAVA_UNIT_TESTS = 'test/mts/tools/mts-tradefed/res/config/mts-bluetooth-tests-list-shard-01.xml'

NATIVE_UNIT_TESTS = 'test/mts/tools/mts-tradefed/res/config/mts-bluetooth-tests-list-shard-02.xml'

JAVA_UNIT_TESTS = 'test/mts/tools/mts-tradefed/res/config/mts-bt-tests-list-shard-01.xml'

NATIVE_UNIT_TESTS = 'test/mts/tools/mts-tradefed/res/config/mts-bt-tests-list-shard-02.xml'

DO_NOT_RETRY_TESTS = {

  'CtsBluetoothTestCases',

  'GoogleBluetoothInstrumentationTests',

android/pandora/server/Android.bp

+4 −1
Original line number Diff line number Diff line
@@ -77,6 +77,9 @@ android_test { 
        "configs/pts_bot_tests_config.json",

        "configs/pts_bot_tests_config_auto.json",

    ],

    test_suites: ["mts-bluetooth"],

    test_suites: [

        "mts-bluetooth",

        "mts-bt",

    ],

    min_sdk_version: "Tiramisu",

}

framework/tests/unit/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -34,5 +34,6 @@ android_test { 
    test_suites: [

        "general-tests",

        "mts-bluetooth",

        "mts-bt",

    ],

}

service/tests/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ android_test { 
    test_suites: [

        "general-tests",

        "mts-bluetooth",

        "mts-bt",

    ],



    min_sdk_version: "Tiramisu",