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

Commit 5617a1da authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update the TEST_MAPPING files on AOSP (framework/av)" am: 46285b89... 

Merge "Update the TEST_MAPPING files on AOSP (framework/av)" am: 46285b89 am: b66c835b am: c29cee7d

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2520555



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

apex/TEST_MAPPING

+3 −3
Original line number Diff line number Diff line
@@ -7,16 +7,16 @@ 
  "presubmit": [

    // The following tests validate codec and drm path.

    {

      "name": "GtsMediaTestCases",

      "name": "WvtsDeviceTestCases",

      "options" : [

        {

          "include-annotation": "android.platform.test.annotations.Presubmit"

        },

        {

          "include-filter": "com.google.android.media.gts.WidevineGenericOpsTests"

          "include-filter": "com.google.android.media.wvts.WidevineGenericOpsTests"

        },

        {

          "include-filter": "com.google.android.media.gts.WidevineH264PlaybackTests"

          "include-filter": "com.google.android.media.wvts.WidevineH264PlaybackTests"

        }

      ]

    }

drm/TEST_MAPPING

+3 −3
Original line number Diff line number Diff line
@@ -2,16 +2,16 @@ 
  "presubmit": [

    // The following tests validate codec and drm path.

    {

      "name": "GtsMediaTestCases",

      "name": "WvtsDeviceTestCases",

      "options" : [

        {

          "include-annotation": "android.platform.test.annotations.Presubmit"

        },

        {

          "include-filter": "com.google.android.media.gts.WidevineGenericOpsTests"

          "include-filter": "com.google.android.media.wvts.WidevineGenericOpsTests"

        },

        {

          "include-filter": "com.google.android.media.gts.WidevineH264PlaybackTests"

          "include-filter": "com.google.android.media.wvts.WidevineH264PlaybackTests"

        }

      ]

    }

drm/libmediadrm/TEST_MAPPING

+4 −4
Original line number Diff line number Diff line 
{

  "presubmit": [

    {

      "name": "GtsMediaTestCases",

      "name": "WvtsDeviceTestCases",

      "options" : [

        {

	  "include-annotation": "android.platform.test.annotations.Presubmit"

        },

        {

          "include-filter": "com.google.android.media.gts.WidevineGenericOpsTests"

          "include-filter": "com.google.android.media.wvts.WidevineGenericOpsTests"

        },

        {

          "include-filter": "com.google.android.media.gts.MediaDrmTest"

          "include-filter": "com.google.android.media.wvts.MediaDrmTest"

        },

        {

          "include-filter": "com.google.android.media.gts.WidevineDashPolicyTests"

          "include-filter": "com.google.android.media.wvts.WidevineDashPolicyTests"

        }

      ]

    }

include/drm/TEST_MAPPING

+3 −3
Original line number Diff line number Diff line 
{

  "presubmit": [

    {

      "name": "GtsMediaTestCases",

      "name": "WvtsDeviceTestCases",

      "options" : [

        {

          "include-annotation": "android.platform.test.annotations.Presubmit"

        },

        {

          "include-filter": "com.google.android.media.gts.WidevineGenericOpsTests"

          "include-filter": "com.google.android.media.wvts.WidevineGenericOpsTests"

        },

        {

          "include-filter": "com.google.android.media.gts.WidevineH264PlaybackTests"

          "include-filter": "com.google.android.media.wvts.WidevineH264PlaybackTests"

        }

      ]

    }

media/TEST_MAPPING

+3 −3
Original line number Diff line number Diff line
@@ -21,16 +21,16 @@ 
    ],

    "presubmit": [

        {

            "name": "GtsMediaTestCases",

            "name": "WvtsDeviceTestCases",

            "options" : [

                {

                    "include-annotation": "android.platform.test.annotations.Presubmit"

                },

                {

                    "include-filter": "com.google.android.media.gts.WidevineGenericOpsTests"

                    "include-filter": "com.google.android.media.wvts.WidevineGenericOpsTests"

                },

                {

                    "include-filter": "com.google.android.media.gts.WidevineH264PlaybackTests"

                    "include-filter": "com.google.android.media.wvts.WidevineH264PlaybackTests"

                }

            ],

            "file_patterns": ["(?i)drm|crypto"]