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

Commit f7f5f52b authored by Raphael Kim's avatar Raphael Kim Committed by Android (Google) Code Review
Browse files

Merge "[CDM][Mobly] Rename multi-device test snippet module for future deprecation." into main

parents 316f8d2f 8c57fc57

tests/CompanionDeviceMultiDeviceTests/client/Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -19,10 +19,11 @@ package { 
    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["frameworks_base_license"],

    default_team: "trendy_team_framework_cdm",

}



android_test {

    name: "cdm_snippet",

    name: "cdm_snippet_legacy",

    srcs: ["src/**/*.kt"],

    manifest: "AndroidManifest.xml",

tests/CompanionDeviceMultiDeviceTests/host/Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package { 
    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["frameworks_base_license"],

    default_team: "trendy_team_framework_cdm",

}



python_test_host {
@@ -36,7 +37,7 @@ python_test_host { 
        tags: ["mobly"],

    },

    data: [

        ":cdm_snippet",

        ":cdm_snippet_legacy",

    ],

    version: {

        py2: {

tests/CompanionDeviceMultiDeviceTests/host/AndroidTest.xml

+2 −2
Original line number Diff line number Diff line
@@ -24,12 +24,12 @@ 


    <device name="device1">

        <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">

            <option name="test-file-name" value="cdm_snippet.apk" />

            <option name="test-file-name" value="cdm_snippet_legacy.apk" />

        </target_preparer>

    </device>

    <device name="device2">

        <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">

            <option name="test-file-name" value="cdm_snippet.apk" />

            <option name="test-file-name" value="cdm_snippet_legacy.apk" />

        </target_preparer>

    </device>