Merge prod-tests/res/config/google/test/framework/media/ from platform/vendor/google_tradefederation to res/config/google/test/framework/media/

51 files changed, 978 insertions, 0 deletions

diff --git a/res/config/google/test/framework/media/adb-screen-record.xml b/res/config/google/test/framework/media/adb-screen-record.xml
new file mode 100644
index 0000000..f7daa23
--- /dev/null
+++ b/res/config/google/test/framework/media/adb-screen-record.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2017 Google Inc. All Rights Reserved -->
+<configuration description="Test adb 'screenrecord' command">
+
+  <option name="test-tag" value="AdbScreenRecord" />
+
+  <target_preparer class="com.google.android.tradefed.targetprep.GoogleDeviceSetup">
+    <option name="screen-always-on" value="on" />
+    <option name="screen-adaptive-brightness" value="off" />
+    <option name="disable-audio" value="false"/>
+    <option name="screen-saver" value="off"/>
+  </target_preparer>
+
+  <test class="com.android.media.tests.AdbScreenrecordTest" />
+
+</configuration>
diff --git a/res/config/google/test/framework/media/audio-func.xml b/res/config/google/test/framework/media/audio-func.xml
new file mode 100644
index 0000000..b379a2d
--- /dev/null
+++ b/res/config/google/test/framework/media/audio-func.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2011 Google Inc. All Rights Reserved -->
+<configuration description="Runs audio functional tests">
+    <option name="test-tag" value="media_audio" />
+
+    <!-- com.google.android.tradefed.targetprep.GoogleDeviceSetup -->
+    <option name="google-device-setup:screen-saver" value="off" />
+    <option name="google-device-setup:local-data-path" value="/google/data/ro/teams/tradefed/testdata/media/media_api/" />
+
+    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
+        <option name="test-file-name" value="mediaframeworktest.apk" />
+    </target_preparer>
+
+    <test class="com.android.tradefed.testtype.InstrumentationTest">
+        <option name="package" value="com.android.mediaframeworktest" />
+        <option name="runner"  value=".MediaFrameworkTestRunner" />
+        <option name="test-package" value="com.android.mediaframeworktest.functional.audio" />
+        <option name="run-name" value="media_audio" />
+    </test>
+</configuration>
diff --git a/res/config/google/test/framework/media/audio-loopback-stress.xml b/res/config/google/test/framework/media/audio-loopback-stress.xml
new file mode 100644
index 0000000..25bd99f
--- /dev/null
+++ b/res/config/google/test/framework/media/audio-loopback-stress.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2017 Google Inc. All Rights Reserved -->
+<configuration description="Runs audio jitter tests">
+
+  <option name="test-tag" value="AudioLoopbackStress" />
+
+  <target_preparer class="com.google.android.tradefed.targetprep.GoogleDeviceSetup">
+    <option name="screen-always-on" value="on" />
+    <option name="screen-adaptive-brightness" value="off" />
+    <option name="disable-audio" value="false"/>
+    <option name="screen-saver" value="off"/>
+    <option name="set-property" key="audio.safemedia.bypass" value="1"/>
+  </target_preparer>
+
+  <target_preparer class="com.android.tradefed.targetprep.InstallApkSetup">
+    <option name="apk-path" value="/google/data/ro/teams/tradefed/testdata/media/apps/Loopback.apk" />
+  </target_preparer>
+
+  <test class="com.android.media.tests.AudioLoopbackTest">
+    <option name="iterations" value="1000" />
+  </test>
+
+</configuration>
diff --git a/res/config/google/test/framework/media/audio-loopback.xml b/res/config/google/test/framework/media/audio-loopback.xml
new file mode 100644
index 0000000..2031f51
--- /dev/null
+++ b/res/config/google/test/framework/media/audio-loopback.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2014 Google Inc. All Rights Reserved -->
+<configuration description="Run audio jitter tests">
+    <option name="test-tag" value="AudioLoopback" />
+
+    <!-- com.google.android.tradefed.targetprep.GoogleDeviceSetup2 -->
+    <option name="google-device-setup:disable-audio" value="false"/>
+    <option name="google-device-setup:screen-saver" value="off"/>
+    <option name="google-device-setup:setprop" value="audio.safemedia.bypass=1"/>
+
+    <target_preparer class="com.android.tradefed.targetprep.InstallApkSetup">
+        <option name="apk-path" value="/google/data/ro/teams/tradefed/testdata/media/apps/Loopback.apk" />
+    </target_preparer>
+
+    <test class="com.android.media.tests.AudioLoopbackTest" />
+</configuration>
diff --git a/res/config/google/test/framework/media/audio-walt-midi.xml b/res/config/google/test/framework/media/audio-walt-midi.xml
new file mode 100644
index 0000000..b2f7916
--- /dev/null
+++ b/res/config/google/test/framework/media/audio-walt-midi.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2016 Google Inc. All Rights Reserved -->
+<configuration description="Run Audio WALT Test on device and get results">
+    <target_preparer class="com.android.tradefed.targetprep.InstallApkSetup">
+        <option name="apk-path" value="/google/data/ro/teams/tradefed/testdata/media/apps/walt.apk" />
+        <option name="apk-path" value="/google/data/ro/teams/tradefed/testdata/media/apps/walt-permission.apk" />
+        <option name="apk-path" value="/google/data/ro/teams/tradefed/testdata/media/apps/walt-permission-instrumentation.apk" />
+    </target_preparer>
+
+    <option name="test-tag" value="AudioWalt" />
+
+    <test class="com.google.android.media.tests.AudioWaltTest">
+        <option name="tigertail-path" value="/google/data/ro/teams/tradefed/testdata/media/scripts/tigertail/tigertail_tool/tigertool.py" />
+        <option name="permission-script-path" value="/google/data/ro/teams/tradefed/testdata/media/scripts/walt-permission.sh"/>
+        <option name="test-type" value="MidiIn"/>
+        <option name="fields" value="time_to_midi,time_total"/>
+    </test>
+</configuration>
+
diff --git a/res/config/google/test/framework/media/camera-burst-shot.xml b/res/config/google/test/framework/media/camera-burst-shot.xml
new file mode 100644
index 0000000..3abc5b7
--- /dev/null
+++ b/res/config/google/test/framework/media/camera-burst-shot.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2017 Google Inc. All Rights Reserved -->
+<configuration description="Runs a Camera App startup test on device">
+  <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup" />
+  <target_preparer class="com.android.tradefed.targetprep.InstallApkSetup" />
+  <target_preparer class="com.android.tradefed.targetprep.DeviceCleaner" />
+  <target_preparer class="com.android.tradefed.targetprep.TimeWaster" />
+  <target_preparer class="com.android.tradefed.targetprep.TemperatureThrottlingWaiter" />
+  <test class="com.android.media.tests.CameraBurstStartupTest"/>
+</configuration>
\ No newline at end of file
diff --git a/res/config/google/test/framework/media/camera-performance.xml b/res/config/google/test/framework/media/camera-performance.xml
new file mode 100644
index 0000000..988afba
--- /dev/null
+++ b/res/config/google/test/framework/media/camera-performance.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2015 Google Inc. All Rights Reserved -->
+<configuration description="Runs a Camera2 Performance CTS test on device">
+    <option name="test-tag" value="CameraFrameworkPerformance" />
+    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
+        <option name="test-file-name" value="CtsCameraTestCases.apk" />
+    </target_preparer>
+    <target_preparer class="com.android.tradefed.targetprep.InstallApkSetup" />
+    <target_preparer class="com.android.tradefed.targetprep.TimeWaster" />
+    <target_preparer class="com.android.tradefed.targetprep.TemperatureThrottlingWaiter" />
+    <test class="com.android.media.tests.CameraPerformanceTest">
+        <option name="test-package" value="android.camera.cts" />
+    </test>
+</configuration>
diff --git a/res/config/google/test/framework/media/camera-shot-latency.xml b/res/config/google/test/framework/media/camera-shot-latency.xml
new file mode 100644
index 0000000..74ccbaa
--- /dev/null
+++ b/res/config/google/test/framework/media/camera-shot-latency.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2015 Google Inc. All Rights Reserved -->
+<configuration description="Runs a Camera app latency test on device">
+    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup" />
+    <target_preparer class="com.android.tradefed.targetprep.InstallApkSetup" />
+    <target_preparer class="com.android.tradefed.targetprep.DeviceCleaner" />
+    <target_preparer class="com.android.tradefed.targetprep.TimeWaster" />
+    <target_preparer class="com.android.tradefed.targetprep.TemperatureThrottlingWaiter" />
+    <test class="com.android.media.tests.CameraShotLatencyTest"/>
+</configuration>
diff --git a/res/config/google/test/framework/media/camera-startup.xml b/res/config/google/test/framework/media/camera-startup.xml
new file mode 100644
index 0000000..17867a8
--- /dev/null
+++ b/res/config/google/test/framework/media/camera-startup.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2015 Google Inc. All Rights Reserved -->
+<configuration description="Runs a Camera App startup test on device">
+    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup" />
+    <target_preparer class="com.android.tradefed.targetprep.InstallApkSetup" />
+    <target_preparer class="com.android.tradefed.targetprep.TimeWaster" />
+    <target_preparer class="com.android.tradefed.targetprep.TemperatureThrottlingWaiter" />
+    <test class="com.android.media.tests.CameraStartupTest"/>
+</configuration>
diff --git a/res/config/google/test/framework/media/camera2-framework-stress.xml b/res/config/google/test/framework/media/camera2-framework-stress.xml
new file mode 100644
index 0000000..85931fc
--- /dev/null
+++ b/res/config/google/test/framework/media/camera2-framework-stress.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2016 Google Inc. All Rights Reserved -->
+<configuration description="Runs a Camera2 framework stress test on device">
+    <option name="test-tag" value="CameraFrameworkStress" />
+    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
+        <option name="test-file-name" value="mediaframeworktest.apk" />
+    </target_preparer>
+    <target_preparer class="com.android.tradefed.targetprep.InstallApkSetup" />
+    <target_preparer class="com.android.tradefed.targetprep.TimeWaster" />
+    <target_preparer class="com.android.tradefed.targetprep.TemperatureThrottlingWaiter" />
+    <test class="com.android.media.tests.Camera2FrameworkStressTest">
+        <option name="test-runner"
+                value="com.android.mediaframeworktest.Camera2InstrumentationTestRunner" />
+    </test>
+</configuration>
diff --git a/res/config/google/test/framework/media/camera2-latency.xml b/res/config/google/test/framework/media/camera2-latency.xml
new file mode 100644
index 0000000..9ed4fe6
--- /dev/null
+++ b/res/config/google/test/framework/media/camera2-latency.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2015 Google Inc. All Rights Reserved -->
+<configuration description="Runs a Camera app latency test on device">
+    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup" />
+    <target_preparer class="com.android.tradefed.targetprep.InstallApkSetup" />
+    <target_preparer class="com.android.tradefed.targetprep.TimeWaster" />
+    <target_preparer class="com.android.tradefed.targetprep.TemperatureThrottlingWaiter" />
+    <test class="com.android.media.tests.Camera2LatencyTest"/>
+</configuration>
diff --git a/res/config/google/test/framework/media/camera2-stress.xml b/res/config/google/test/framework/media/camera2-stress.xml
new file mode 100644
index 0000000..8400eae
--- /dev/null
+++ b/res/config/google/test/framework/media/camera2-stress.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2015 Google Inc. All Rights Reserved -->
+<configuration description="Runs a Camera stress test on device">
+    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup" />
+    <target_preparer class="com.android.tradefed.targetprep.InstallApkSetup" />
+    <target_preparer class="com.android.tradefed.targetprep.TimeWaster" />
+    <target_preparer class="com.android.tradefed.targetprep.TemperatureThrottlingWaiter" />
+    <test class="com.android.media.tests.Camera2StressTest"/>
+</configuration>
diff --git a/res/config/google/test/framework/media/cast-player.xml b/res/config/google/test/framework/media/cast-player.xml
new file mode 100644
index 0000000..f764eb1
--- /dev/null
+++ b/res/config/google/test/framework/media/cast-player.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2014 Google Inc. All Rights Reserved -->
+<configuration description="Run live streams test with cast player">
+    <option name="test-tag" value="cast-player" />
+
+    <test class="com.google.android.apps.mediashell.CastReceiverTestRunner">
+        <option name="run-name" value="cast-player" />
+        <option name="test-count" value="1" />
+        <option name="testrun-timeout" value="60" />
+    </test>
+</configuration>
\ No newline at end of file
diff --git a/res/config/google/test/framework/media/gts-media.xml b/res/config/google/test/framework/media/gts-media.xml
new file mode 100644
index 0000000..3a6e4aa
--- /dev/null
+++ b/res/config/google/test/framework/media/gts-media.xml
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration description="Runs xts media tests">
+    <option name="test-tag" value="xts_media_test" />
+
+    <!-- com.google.android.tradefed.targetprep.GoogleDeviceSetup -->
+    <option name="google-device-setup:screen-saver" value="off" />
+
+    <target_preparer class="com.android.tradefed.targetprep.InstallApkSetup">
+        <option name="apk-path" value="/google/data/ro/teams/tradefed/testdata/media/GtsMediaTestCases-nyc.apk" />
+    </target_preparer>
+
+    <test class="com.android.tradefed.testtype.InstrumentationTest">
+        <option name="class" value="com.google.android.media.gts.DecoderMetricsTests" />
+        <option name="package" value="com.google.android.media.gts" />
+        <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />
+        <option name="run-name" value="xts_media_test" />
+        <option name="shell-timeout" value="2000000" />
+        <option name="test-timeout" value="600000" />
+        <option name="bugreport-on-failure" value="EACH" />
+    </test>
+
+    <test class="com.android.tradefed.testtype.InstrumentationTest">
+        <option name="class" value="com.google.android.media.gts.DrmSessionManagerTest" />
+        <option name="package" value="com.google.android.media.gts" />
+        <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />
+        <option name="run-name" value="xts_media_test" />
+        <option name="shell-timeout" value="2000000" />
+        <option name="test-timeout" value="600000" />
+        <option name="bugreport-on-failure" value="EACH" />
+    </test>
+
+    <test class="com.android.tradefed.testtype.InstrumentationTest">
+        <option name="class" value="com.google.android.media.gts.MediaCodecCencTest" />
+        <option name="package" value="com.google.android.media.gts" />
+        <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />
+        <option name="run-name" value="xts_media_test" />
+        <option name="shell-timeout" value="2000000" />
+        <option name="test-timeout" value="600000" />
+        <option name="bugreport-on-failure" value="EACH" />
+    </test>
+
+    <test class="com.android.tradefed.testtype.InstrumentationTest">
+        <option name="class" value="com.google.android.media.gts.MediaCodecStressTest" />
+        <option name="package" value="com.google.android.media.gts" />
+        <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />
+        <option name="run-name" value="xts_media_test" />
+        <option name="shell-timeout" value="2000000" />
+        <option name="test-timeout" value="600000" />
+        <option name="bugreport-on-failure" value="EACH" />
+    </test>
+
+    <test class="com.android.tradefed.testtype.InstrumentationTest">
+        <option name="class" value="com.google.android.media.gts.MediaCodecTest" />
+        <option name="package" value="com.google.android.media.gts" />
+        <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />
+        <option name="run-name" value="xts_media_test" />
+        <option name="shell-timeout" value="2000000" />
+        <option name="test-timeout" value="600000" />
+        <option name="bugreport-on-failure" value="EACH" />
+    </test>
+
+    <test class="com.android.tradefed.testtype.InstrumentationTest">
+        <option name="class" value="com.google.android.media.gts.MediaDrmTest" />
+        <option name="package" value="com.google.android.media.gts" />
+        <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />
+        <option name="run-name" value="xts_media_test" />
+        <option name="shell-timeout" value="2000000" />
+        <option name="test-timeout" value="600000" />
+        <option name="bugreport-on-failure" value="EACH" />
+    </test>
+
+    <test class="com.android.tradefed.testtype.InstrumentationTest">
+        <option name="class" value="com.google.android.media.gts.MediaPlayerTest" />
+        <option name="package" value="com.google.android.media.gts" />
+        <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />
+        <option name="run-name" value="xts_media_test" />
+        <option name="shell-timeout" value="2000000" />
+        <option name="test-timeout" value="600000" />
+        <option name="bugreport-on-failure" value="EACH" />
+    </test>
+
+    <test class="com.android.tradefed.testtype.InstrumentationTest">
+        <option name="class" value="com.google.android.media.gts.Vp8CodecTest" />
+        <option name="package" value="com.google.android.media.gts" />
+        <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />
+        <option name="run-name" value="xts_media_test" />
+        <option name="shell-timeout" value="2000000" />
+        <option name="test-timeout" value="600000" />
+        <option name="bugreport-on-failure" value="EACH" />
+    </test>
+
+    <test class="com.android.tradefed.testtype.InstrumentationTest">
+        <option name="class" value="com.google.android.media.gts.WidevineCodecStressTests" />
+        <option name="package" value="com.google.android.media.gts" />
+        <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />
+        <option name="run-name" value="xts_media_test" />
+        <option name="shell-timeout" value="2000000" />
+        <option name="test-timeout" value="600000" />
+        <option name="bugreport-on-failure" value="EACH" />
+    </test>
+
+    <test class="com.android.tradefed.testtype.InstrumentationTest">
+        <option name="class" value="com.google.android.media.gts.WidevineDashPolicyTests" />
+        <option name="package" value="com.google.android.media.gts" />
+        <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />
+        <option name="run-name" value="xts_media_test" />
+        <option name="shell-timeout" value="2000000" />
+        <option name="test-timeout" value="600000" />
+        <option name="bugreport-on-failure" value="EACH" />
+    </test>
+
+    <test class="com.android.tradefed.testtype.InstrumentationTest">
+        <option name="class" value="com.google.android.media.gts.WidevineFailureTests" />
+        <option name="package" value="com.google.android.media.gts" />
+        <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />
+        <option name="run-name" value="xts_media_test" />
+        <option name="shell-timeout" value="2000000" />
+        <option name="test-timeout" value="600000" />
+        <option name="bugreport-on-failure" value="EACH" />
+    </test>
+
+    <test class="com.android.tradefed.testtype.InstrumentationTest">
+        <option name="class" value="com.google.android.media.gts.WidevineGenericOpsTests" />
+        <option name="package" value="com.google.android.media.gts" />
+        <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />
+        <option name="run-name" value="xts_media_test" />
+        <option name="shell-timeout" value="2000000" />
+        <option name="test-timeout" value="600000" />
+        <option name="bugreport-on-failure" value="EACH" />
+    </test>
+
+    <test class="com.android.tradefed.testtype.InstrumentationTest">
+        <option name="class" value="com.google.android.media.gts.WidevineH264PlaybackTests" />
+        <option name="package" value="com.google.android.media.gts" />
+        <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />
+        <option name="run-name" value="xts_media_test" />
+        <option name="shell-timeout" value="2000000" />
+        <option name="test-timeout" value="600000" />
+        <option name="bugreport-on-failure" value="EACH" />
+    </test>
+
+    <test class="com.android.tradefed.testtype.InstrumentationTest">
+        <option name="class" value="com.google.android.media.gts.WidevineHEVCPlaybackTests" />
+        <option name="package" value="com.google.android.media.gts" />
+        <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />
+        <option name="run-name" value="xts_media_test" />
+        <option name="shell-timeout" value="2000000" />
+        <option name="test-timeout" value="600000" />
+        <option name="bugreport-on-failure" value="EACH" />
+    </test>
+
+    <test class="com.android.tradefed.testtype.InstrumentationTest">
+        <option name="class" value="com.google.android.media.gts.WidevineHLSPlaybackTests" />
+        <option name="package" value="com.google.android.media.gts" />
+        <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />
+        <option name="run-name" value="xts_media_test" />
+        <option name="shell-timeout" value="2000000" />
+        <option name="test-timeout" value="600000" />
+        <option name="bugreport-on-failure" value="EACH" />
+    </test>
+
+    <test class="com.android.tradefed.testtype.InstrumentationTest">
+        <option name="class" value="com.google.android.media.gts.WidevineVP9WebMPlaybackTests" />
+        <option name="package" value="com.google.android.media.gts" />
+        <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />
+        <option name="run-name" value="xts_media_test" />
+        <option name="shell-timeout" value="2000000" />
+        <option name="test-timeout" value="600000" />
+        <option name="bugreport-on-failure" value="EACH" />
+    </test>
+
+    <test class="com.android.tradefed.testtype.InstrumentationTest">
+        <option name="class" value="com.google.android.media.gts.WidevineYouTubePerformanceTests" />
+        <option name="package" value="com.google.android.media.gts" />
+        <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />
+        <option name="run-name" value="xts_media_test" />
+        <option name="shell-timeout" value="2000000" />
+        <option name="test-timeout" value="600000" />
+        <option name="bugreport-on-failure" value="EACH" />
+    </test>
+</configuration>
diff --git a/res/config/google/test/framework/media/media-integration.xml b/res/config/google/test/framework/media/media-integration.xml
new file mode 100644
index 0000000..3a9ac02
--- /dev/null
+++ b/res/config/google/test/framework/media/media-integration.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2011 Google Inc. All Rights Reserved -->
+<configuration description="Runs audio functional tests">
+    <option name="test-tag" value="media_integration" />
+
+    <!-- com.google.android.tradefed.targetprep.GoogleDeviceSetup -->
+    <option name="google-device-setup:local-data-path" value="/google/data/ro/teams/tradefed/testdata/media/media_api/" />
+
+    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
+        <option name="test-file-name" value="mediaframeworktest.apk" />
+    </target_preparer>
+
+    <test class="com.android.tradefed.testtype.InstrumentationTest">
+        <option name="package" value="com.android.mediaframeworktest" />
+        <option name="runner"  value=".MediaFrameworkTestRunner" />
+        <option name="test-package" value="com.android.mediaframeworktest.integration" />
+        <option name="run-name" value="media_integration" />
+    </test>
+</configuration>
diff --git a/res/config/google/test/framework/media/media-memory.xml b/res/config/google/test/framework/media/media-memory.xml
new file mode 100644
index 0000000..f37bff6
--- /dev/null
+++ b/res/config/google/test/framework/media/media-memory.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2011 Google Inc. All Rights Reserved -->
+<configuration description="Runs media memory tests">
+    <option name="test-tag" value="media_memory_test" />
+
+    <!-- com.google.android.tradefed.targetprep.GoogleDeviceSetup -->
+    <option name="google-device-setup:local-data-path" value="/google/data/ro/teams/tradefed/testdata/media/media_api/" />
+
+    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
+        <option name="test-file-name" value="mediaframeworktest.apk" />
+    </target_preparer>
+
+    <test class="com.android.media.tests.MediaMemoryTest" />
+</configuration>
diff --git a/res/config/google/test/framework/media/media-unit.xml b/res/config/google/test/framework/media/media-unit.xml
new file mode 100644
index 0000000..d6adcb8
--- /dev/null
+++ b/res/config/google/test/framework/media/media-unit.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2011 Google Inc. All Rights Reserved -->
+<configuration description="Runs audio functional tests">
+    <option name="test-tag" value="media_unit" />
+
+    <!-- com.google.android.tradefed.targetprep.GoogleDeviceSetup -->
+    <option name="google-device-setup:local-data-path" value="/google/data/ro/teams/tradefed/testdata/media/media_api/" />
+
+    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
+        <option name="test-file-name" value="mediaframeworktest.apk" />
+    </target_preparer>
+
+    <test class="com.android.tradefed.testtype.InstrumentationTest">
+        <option name="package" value="com.android.mediaframeworktest" />
+        <option name="runner"  value=".MediaFrameworkTestRunner" />
+        <option name="test-package" value="com.android.mediaframeworktest.unit" />
+        <option name="run-name" value="media_unit" />
+    </test>
+</configuration>
diff --git a/res/config/google/test/framework/media/playback-func.xml b/res/config/google/test/framework/media/playback-func.xml
new file mode 100644
index 0000000..61a7234
--- /dev/null
+++ b/res/config/google/test/framework/media/playback-func.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2011 Google Inc. All Rights Reserved -->
+<configuration description="Runs media playback tests">
+    <option name="test-tag" value="media_playback_test" />
+
+    <!-- com.google.android.tradefed.targetprep.GoogleDeviceSetup -->
+    <option name="google-device-setup:screen-saver" value="off" />
+    <option name="google-device-setup:local-data-path" value="/google/data/ro/teams/tradefed/testdata/media/media_api/" />
+
+    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
+        <option name="test-file-name" value="mediaframeworktest.apk" />
+    </target_preparer>
+
+    <test class="com.android.tradefed.testtype.InstrumentationTest">
+        <option name="package" value="com.android.mediaframeworktest" />
+        <option name="runner"  value=".MediaFrameworkTestRunner" />
+        <option name="test-package" value="com.android.mediaframeworktest.functional.mediaplayback" />
+        <option name="run-name" value="media_playback_test" />
+    </test>
+</configuration>
diff --git a/res/config/google/test/framework/media/player-streaming.xml b/res/config/google/test/framework/media/player-streaming.xml
new file mode 100755
index 0000000..ece72a2
--- /dev/null
+++ b/res/config/google/test/framework/media/player-streaming.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2011 Google Inc. All Rights Reserved -->
+<configuration description="Runs media player streaming tests">
+    <option name="test-tag" value="media_player_streaming" />
+
+    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
+        <option name="test-file-name" value="mediaframeworktest.apk" />
+    </target_preparer>
+    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
+        <option name="push" value="/google/data/ro/teams/tradefed/testdata/media/media_api/streaming.txt->/sdcard/media_api/streaming.txt" />
+    </target_preparer>
+
+    <test class="com.android.media.tests.MediaPlayerStressTest">
+        <option name="test-class" value="com.android.mediaframeworktest.stress.MediaPlayerStreamingStressTest" />
+        <option name="metrics-name" value="MediaPlayerStreaming" />
+        <option name="result-file" value="StreamingTestResult.txt" />
+    </test>
+</configuration>
diff --git a/res/config/google/test/framework/media/player-stress.xml b/res/config/google/test/framework/media/player-stress.xml
new file mode 100755
index 0000000..23ecb6c
--- /dev/null
+++ b/res/config/google/test/framework/media/player-stress.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2011 Google Inc. All Rights Reserved -->
+<configuration description="Runs media player stress tests">
+    <option name="test-tag" value="media_player_stress" />
+
+    <!-- com.google.android.tradefed.targetprep.GoogleDeviceSetup -->
+    <option name="google-device-setup:screen-saver" value="off" />
+
+    <!-- Left blank so some commands can push their own files to device -->
+    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer" />
+
+    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
+        <option name="test-file-name" value="mediaframeworktest.apk" />
+    </target_preparer>
+
+    <test class="com.android.media.tests.MediaPlayerStressTest" />
+</configuration>
diff --git a/res/config/google/test/framework/media/recorder-stress.xml b/res/config/google/test/framework/media/recorder-stress.xml
new file mode 100644
index 0000000..1dcf51d
--- /dev/null
+++ b/res/config/google/test/framework/media/recorder-stress.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2011 Google Inc. All Rights Reserved -->
+<configuration description="Runs media stress tests">
+    <option name="test-tag" value="media_stress" />
+
+    <!-- com.google.android.tradefed.targetprep.GoogleDeviceSetup -->
+    <option name="google-device-setup:local-data-path" value="/google/data/ro/teams/tradefed/testdata/media/media_api/" />
+
+    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
+        <option name="test-file-name" value="mediaframeworktest.apk" />
+    </target_preparer>
+
+    <test class="com.android.media.tests.MediaStressTest" />
+</configuration>
diff --git a/res/config/google/test/framework/media/widevine/reporters/widevine-reporter.xml b/res/config/google/test/framework/media/widevine/reporters/widevine-reporter.xml
new file mode 100644
index 0000000..cfbc980
--- /dev/null
+++ b/res/config/google/test/framework/media/widevine/reporters/widevine-reporter.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2015 Google Inc. All Rights Reserved -->
+<!-- Common loggers, log savers, and result reporters for Widevine templates. -->
+<configuration description="Common loggers, log savers, and result reporters for Widevine templates" >
+    <logger class="com.android.tradefed.log.FileLogger" />
+    <object type="util" class="com.android.tradefed.util.FileUtil">
+      <option name="min-disk-space" value="0"/>
+    </object>
+    <log_saver class="com.android.tradefed.result.FileSystemLogSaver">
+        <option name="log-file-path" value="/google/data/rw/teams/widevine-tradefed-logging" />
+        <option name="log-file-url" value="https://x20web.corp.google.com/teams/widevine-tradefed-logging" />
+        <option name="log-retention-days" value="60" />
+    </log_saver>
+    <result_reporter class="com.google.android.tradefed.result.SpongeResultReporter">
+        <option name="report-error-email-sender" value="widevine-tf-test@google.com" />
+        <option name="report-error-email-destination" value="widevine-android-test@google.com" />
+    </result_reporter>
+    <result_reporter class="com.android.tradefed.result.InvocationFailureEmailResultReporter" >
+        <option name="sender" value="widevine-tf-test@google.com" />
+    </result_reporter>
+    <result_reporter class="com.android.tradefed.result.DeviceUnavailEmailResultReporter" >
+        <option name="sender" value="widevine-tf-test@google.com" />
+        <option name="destination" value="widevine-android-test@google.com" />
+    </result_reporter>
+    <result_reporter class="com.android.tradefed.result.EmailResultReporter">
+      <option name="sender" value="widevine-tf-test@google.com" />
+      <option name="destination" value="widevine-android-test@google.com" />
+    </result_reporter>
+    <result_reporter class="com.android.tradefed.result.TestFailureEmailResultReporter" >
+      <option name="sender" value="widevine-tf-test@google.com" />
+      <option name="destination" value="widevine-android@google.com" />
+      <option name="subject-tag" value="Test Failed:" />
+    </result_reporter>
+</configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-base64.xml b/res/config/google/test/framework/media/widevine/tests/widevine-base64.xml
new file mode 100644
index 0000000..6bee54b
--- /dev/null
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-base64.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2015 Google Inc. All Rights Reserved -->
+<!-- Required options: branch build-flavor -->
+<configuration description="Downloads build, flashes on device, and runs Widevine Modular DRM tests">
+    <option name="test-tag" value="widevineBase64" />
+    <target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
+        <option name="test-file-name" value="bin/base64_test" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.GTest">
+        <option name="native-test-device-path" value="/data/bin" />
+        <option name="module-name" value="base64_test" />
+        <option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+        <option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+    </test>
+</configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-buffer-reader.xml b/res/config/google/test/framework/media/widevine/tests/widevine-buffer-reader.xml
new file mode 100644
index 0000000..48275c4
--- /dev/null
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-buffer-reader.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2015 Google Inc. All Rights Reserved -->
+<!-- Required options: branch build-flavor -->
+<configuration description="Downloads build, flashes on device, and runs Widevine Modular DRM tests">
+    <option name="test-tag" value="widevineBufferReader" />
+    <target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
+        <option name="test-file-name" value="bin/buffer_reader_test" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.GTest">
+        <option name="native-test-device-path" value="/data/bin" />
+        <option name="module-name" value="buffer_reader_test" />
+        <option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+        <option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+    </test>
+</configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-cdm-engine.xml b/res/config/google/test/framework/media/widevine/tests/widevine-cdm-engine.xml
new file mode 100644
index 0000000..7bc32b9
--- /dev/null
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-cdm-engine.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2015 Google Inc. All Rights Reserved -->
+<!-- Required options: branch build-flavor -->
+<configuration description="Downloads build, flashes on device, and runs Widevine Modular DRM tests">
+    <option name="test-tag" value="widevineCdmEngine" />
+    <target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
+        <option name="test-file-name" value="bin/cdm_engine_test" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.GTest">
+        <option name="native-test-device-path" value="/data/bin" />
+        <option name="module-name" value="cdm_engine_test" />
+        <option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+        <option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+    </test>
+</configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-cdm-extended-duration.xml b/res/config/google/test/framework/media/widevine/tests/widevine-cdm-extended-duration.xml
new file mode 100644
index 0000000..d8107d0
--- /dev/null
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-cdm-extended-duration.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2015 Google Inc. All Rights Reserved -->
+<!-- Required options: branch build-flavor -->
+<configuration description="Downloads build, flashes on device, and runs Widevine Modular DRM tests">
+    <option name="test-tag" value="widevineCdmExtendedDuration" />
+    <target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
+        <option name="test-file-name" value="bin/cdm_extended_duration_test" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.GTest">
+        <option name="native-test-device-path" value="/data/bin" />
+        <option name="module-name" value="cdm_extended_duration_test" />
+        <option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+        <option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+    </test>
+</configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-cdm-session-unit.xml b/res/config/google/test/framework/media/widevine/tests/widevine-cdm-session-unit.xml
new file mode 100644
index 0000000..cf09f95
--- /dev/null
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-cdm-session-unit.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2015 Google Inc. All Rights Reserved -->
+<!-- Required options: branch build-flavor -->
+<configuration description="Downloads build, flashes on device, and runs Widevine Modular DRM tests">
+    <option name="test-tag" value="widevineCdmSessionUnit" />
+    <target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
+        <option name="test-file-name" value="bin/cdm_session_unittest" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.GTest">
+        <option name="native-test-device-path" value="/data/bin" />
+        <option name="module-name" value="cdm_session_unittest" />
+        <option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+        <option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+    </test>
+</configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-device-files-unit.xml b/res/config/google/test/framework/media/widevine/tests/widevine-device-files-unit.xml
new file mode 100644
index 0000000..5080838
--- /dev/null
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-device-files-unit.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2015 Google Inc. All Rights Reserved -->
+<!-- Required options: branch build-flavor -->
+<configuration description="Downloads build, flashes on device, and runs Widevine Modular DRM tests">
+    <option name="test-tag" value="widevineDeviceFilesUnit" />
+    <target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
+        <option name="test-file-name" value="bin/device_files_unittest" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.GTest">
+        <option name="native-test-device-path" value="/data/bin" />
+        <option name="module-name" value="device_files_unittest" />
+        <option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+        <option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+    </test>
+</configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-distribution.xml b/res/config/google/test/framework/media/widevine/tests/widevine-distribution.xml
new file mode 100644
index 0000000..9f4a54e
--- /dev/null
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-distribution.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2015 Google Inc. All Rights Reserved -->
+<!-- Required options: branch build-flavor -->
+<configuration description="Downloads build, flashes on device, and runs Widevine Modular DRM tests">
+    <option name="test-tag" value="widevineDistribution" />
+    <target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
+        <option name="test-file-name" value="bin/distribution_test" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.GTest">
+        <option name="native-test-device-path" value="/data/bin" />
+        <option name="module-name" value="distribution_test" />
+        <option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+        <option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+    </test>
+</configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-event-metric.xml b/res/config/google/test/framework/media/widevine/tests/widevine-event-metric.xml
new file mode 100644
index 0000000..80a4022
--- /dev/null
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-event-metric.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2015 Google Inc. All Rights Reserved -->
+<!-- Required options: branch build-flavor -->
+<configuration description="Downloads build, flashes on device, and runs Widevine Modular DRM tests">
+    <option name="test-tag" value="widevineEventMetric" />
+    <target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
+        <option name="test-file-name" value="bin/event_metric_test" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.GTest">
+        <option name="native-test-device-path" value="/data/bin" />
+        <option name="module-name" value="event_metric_test" />
+        <option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+        <option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+    </test>
+</configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-file-store-unit.xml b/res/config/google/test/framework/media/widevine/tests/widevine-file-store-unit.xml
new file mode 100644
index 0000000..e294fb0
--- /dev/null
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-file-store-unit.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2015 Google Inc. All Rights Reserved -->
+<!-- Required options: branch build-flavor -->
+<configuration description="Downloads build, flashes on device, and runs Widevine Modular DRM tests">
+    <option name="test-tag" value="widevineFileStoreUnit" />
+    <target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
+        <option name="test-file-name" value="bin/file_store_unittest" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.GTest">
+        <option name="native-test-device-path" value="/data/bin" />
+        <option name="module-name" value="file_store_unittest" />
+        <option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+        <option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+    </test>
+</configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-file-utils-unit.xml b/res/config/google/test/framework/media/widevine/tests/widevine-file-utils-unit.xml
new file mode 100644
index 0000000..67db9ff
--- /dev/null
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-file-utils-unit.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2015 Google Inc. All Rights Reserved -->
+<!-- Required options: branch build-flavor -->
+<configuration description="Downloads build, flashes on device, and runs Widevine Modular DRM tests">
+    <option name="test-tag" value="widevineFileUtilsUnit" />
+    <target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
+        <option name="test-file-name" value="bin/file_utils_unittest" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.GTest">
+        <option name="native-test-device-path" value="/data/bin" />
+        <option name="module-name" value="file_utils_unittest" />
+        <option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+        <option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+    </test>
+</configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-http-socket.xml b/res/config/google/test/framework/media/widevine/tests/widevine-http-socket.xml
new file mode 100644
index 0000000..fed3db1
--- /dev/null
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-http-socket.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2015 Google Inc. All Rights Reserved -->
+<!-- Required options: branch build-flavor -->
+<configuration description="Downloads build, flashes on device, and runs Widevine Modular DRM tests">
+    <option name="test-tag" value="widevineHttpSocket" />
+    <target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
+        <option name="test-file-name" value="bin/http_socket_test" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.GTest">
+        <option name="native-test-device-path" value="/data/bin" />
+        <option name="module-name" value="http_socket_test" />
+        <option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+        <option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+    </test>
+</configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-init-data-unit.xml b/res/config/google/test/framework/media/widevine/tests/widevine-init-data-unit.xml
new file mode 100644
index 0000000..20be09d
--- /dev/null
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-init-data-unit.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2015 Google Inc. All Rights Reserved -->
+<!-- Required options: branch build-flavor -->
+<configuration description="Downloads build, flashes on device, and runs Widevine Modular DRM tests">
+    <option name="test-tag" value="widevineInitDataUnit" />
+    <target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
+        <option name="test-file-name" value="bin/initialization_data_unittest" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.GTest">
+        <option name="native-test-device-path" value="/data/bin" />
+        <option name="module-name" value="initialization_data_unittest" />
+        <option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+        <option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+    </test>
+</configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-libwvdrmdrmplugin-hidl.xml b/res/config/google/test/framework/media/widevine/tests/widevine-libwvdrmdrmplugin-hidl.xml
new file mode 100644
index 0000000..56cc8df
--- /dev/null
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-libwvdrmdrmplugin-hidl.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2015 Google Inc. All Rights Reserved -->
+<!-- Required options: branch build-flavor -->
+<configuration description="Downloads build, flashes on device, and runs Widevine Modular DRM tests">
+    <option name="test-tag" value="widevineLibwvdrmdrmpluginHidl" />
+    <target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
+        <option name="test-file-name" value="bin/libwvdrmdrmplugin_hidl_test" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.GTest">
+        <option name="native-test-device-path" value="/data/bin" />
+        <option name="module-name" value="libwvdrmdrmplugin_hidl_test" />
+        <option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+        <option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+    </test>
+</configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-libwvdrmdrmplugin.xml b/res/config/google/test/framework/media/widevine/tests/widevine-libwvdrmdrmplugin.xml
new file mode 100644
index 0000000..7445a50
--- /dev/null
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-libwvdrmdrmplugin.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2015 Google Inc. All Rights Reserved -->
+<!-- Required options: branch build-flavor -->
+<configuration description="Downloads build, flashes on device, and runs Widevine Modular DRM tests">
+    <option name="test-tag" value="widevineLibwvdrmdrmplugin" />
+    <target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
+        <option name="test-file-name" value="bin/libwvdrmdrmplugin_test" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.GTest">
+        <option name="native-test-device-path" value="/data/bin" />
+        <option name="module-name" value="libwvdrmdrmplugin_test" />
+        <option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+        <option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+    </test>
+</configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-libwvdrmengine-hidl.xml b/res/config/google/test/framework/media/widevine/tests/widevine-libwvdrmengine-hidl.xml
new file mode 100644
index 0000000..fa22bbe
--- /dev/null
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-libwvdrmengine-hidl.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2015 Google Inc. All Rights Reserved -->
+<!-- Required options: branch build-flavor -->
+<configuration description="Downloads build, flashes on device, and runs Widevine Modular DRM tests">
+    <option name="test-tag" value="widevineLibwvdrmengineHidl" />
+    <target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
+        <option name="test-file-name" value="bin/libwvdrmengine_hidl_test" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.GTest">
+        <option name="native-test-device-path" value="/data/bin" />
+        <option name="module-name" value="libwvdrmengine_hidl_test" />
+        <option name="ld-library-path" value="/system/vendor/lib/mediadrm" />
+        <option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+        <option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+    </test>
+</configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-libwvdrmengine.xml b/res/config/google/test/framework/media/widevine/tests/widevine-libwvdrmengine.xml
new file mode 100644
index 0000000..d690556
--- /dev/null
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-libwvdrmengine.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2015 Google Inc. All Rights Reserved -->
+<!-- Required options: branch build-flavor -->
+<configuration description="Downloads build, flashes on device, and runs Widevine Modular DRM tests">
+    <option name="test-tag" value="widevineLibwvdrmengine" />
+    <target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
+        <option name="test-file-name" value="bin/libwvdrmengine_test" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.GTest">
+        <option name="native-test-device-path" value="/data/bin" />
+        <option name="module-name" value="libwvdrmengine_test" />
+        <option name="ld-library-path" value="/system/vendor/lib/mediadrm" />
+        <option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+        <option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+    </test>
+</configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-libwvdrmmediacrypto-hidl.xml b/res/config/google/test/framework/media/widevine/tests/widevine-libwvdrmmediacrypto-hidl.xml
new file mode 100644
index 0000000..b0cc4ff
--- /dev/null
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-libwvdrmmediacrypto-hidl.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2015 Google Inc. All Rights Reserved -->
+<!-- Required options: branch build-flavor -->
+<configuration description="Downloads build, flashes on device, and runs Widevine Modular DRM tests">
+    <option name="test-tag" value="widevineLibwvdrmmediacryptoHidl" />
+    <target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
+        <option name="test-file-name" value="bin/libwvdrmmediacrypto_hidl_test" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.GTest">
+        <option name="native-test-device-path" value="/data/bin" />
+        <option name="module-name" value="libwvdrmmediacrypto_hidl_test" />
+        <option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+        <option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+    </test>
+</configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-libwvdrmmediacrypto.xml b/res/config/google/test/framework/media/widevine/tests/widevine-libwvdrmmediacrypto.xml
new file mode 100644
index 0000000..ae4fb13
--- /dev/null
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-libwvdrmmediacrypto.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2015 Google Inc. All Rights Reserved -->
+<!-- Required options: branch build-flavor -->
+<configuration description="Downloads build, flashes on device, and runs Widevine Modular DRM tests">
+    <option name="test-tag" value="widevineLibwvdrmmediacrypto" />
+    <target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
+        <option name="test-file-name" value="bin/libwvdrmmediacrypto_test" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.GTest">
+        <option name="native-test-device-path" value="/data/bin" />
+        <option name="module-name" value="libwvdrmmediacrypto_test" />
+        <option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+        <option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+    </test>
+</configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-license-keys-unit.xml b/res/config/google/test/framework/media/widevine/tests/widevine-license-keys-unit.xml
new file mode 100644
index 0000000..df26cff
--- /dev/null
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-license-keys-unit.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2015 Google Inc. All Rights Reserved -->
+<!-- Required options: branch build-flavor -->
+<configuration description="Downloads build, flashes on device, and runs Widevine Modular DRM tests">
+    <option name="test-tag" value="widevineLicenseKeysUnit" />
+    <target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
+        <option name="test-file-name" value="bin/license_keys_unittest" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.GTest">
+        <option name="native-test-device-path" value="/data/bin" />
+        <option name="module-name" value="license_keys_unittest" />
+        <option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+        <option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+    </test>
+</configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-license-unit.xml b/res/config/google/test/framework/media/widevine/tests/widevine-license-unit.xml
new file mode 100644
index 0000000..7877b26
--- /dev/null
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-license-unit.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2015 Google Inc. All Rights Reserved -->
+<!-- Required options: branch build-flavor -->
+<configuration description="Downloads build, flashes on device, and runs Widevine Modular DRM tests">
+    <option name="test-tag" value="widevineLicenseUnit" />
+    <target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
+        <option name="test-file-name" value="bin/license_unittest" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.GTest">
+        <option name="native-test-device-path" value="/data/bin" />
+        <option name="module-name" value="license_unittest" />
+        <option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+        <option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+    </test>
+</configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-oemcrypto.xml b/res/config/google/test/framework/media/widevine/tests/widevine-oemcrypto.xml
new file mode 100644
index 0000000..73e5f76
--- /dev/null
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-oemcrypto.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2015 Google Inc. All Rights Reserved -->
+<!-- Required options: branch build-flavor -->
+<configuration description="Downloads build, flashes on device, and runs Widevine Modular DRM tests">
+    <option name="test-tag" value="widevineOemcrypto" />
+    <target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
+        <option name="test-file-name" value="bin/oemcrypto_test" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.GTest">
+        <option name="native-test-device-path" value="/data/bin" />
+        <option name="module-name" value="oemcrypto_test" />
+        <option name="negative-testname-filter" value="OEMCryptoKeyboxTest.GetKeyDataNullPointer" />
+        <option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+        <option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+    </test>
+    <test class="com.android.tradefed.testtype.GTest">
+        <option name="native-test-device-path" value="/data/bin" />
+        <option name="module-name" value="oemcrypto_test" />
+        <option name="positive-testname-filter" value="OEMCryptoKeyboxTest.GetKeyDataNullPointer" />
+        <option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+        <option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+    </test>
+</configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-policy-engine-constraints-unit.xml b/res/config/google/test/framework/media/widevine/tests/widevine-policy-engine-constraints-unit.xml
new file mode 100644
index 0000000..50a9bfe
--- /dev/null
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-policy-engine-constraints-unit.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2015 Google Inc. All Rights Reserved -->
+<!-- Required options: branch build-flavor -->
+<configuration description="Downloads build, flashes on device, and runs Widevine Modular DRM tests">
+    <option name="test-tag" value="widevinePolicyEngineConstraintsUnit" />
+    <target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
+        <option name="test-file-name" value="bin/policy_engine_constraints_unittest" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.GTest">
+        <option name="native-test-device-path" value="/data/bin" />
+        <option name="module-name" value="policy_engine_constraints_unittest" />
+        <option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+        <option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+    </test>
+</configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-policy-engine-unit.xml b/res/config/google/test/framework/media/widevine/tests/widevine-policy-engine-unit.xml
new file mode 100644
index 0000000..a7c37c2
--- /dev/null
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-policy-engine-unit.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2015 Google Inc. All Rights Reserved -->
+<!-- Required options: branch build-flavor -->
+<configuration description="Downloads build, flashes on device, and runs Widevine Modular DRM tests">
+    <option name="test-tag" value="widevinePolicyEngineUnit" />
+    <target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
+        <option name="test-file-name" value="bin/policy_engine_unittest" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.GTest">
+        <option name="native-test-device-path" value="/data/bin" />
+        <option name="module-name" value="policy_engine_unittest" />
+        <option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+        <option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+    </test>
+</configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-request-license.xml b/res/config/google/test/framework/media/widevine/tests/widevine-request-license.xml
new file mode 100644
index 0000000..30e8c9d
--- /dev/null
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-request-license.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2015 Google Inc. All Rights Reserved -->
+<!-- Required options: branch build-flavor -->
+<configuration description="Downloads build, flashes on device, and runs Widevine Modular DRM tests">
+    <option name="test-tag" value="widevineRequestLicense" />
+    <target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
+        <option name="test-file-name" value="bin/request_license_test" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.GTest">
+        <option name="native-test-device-path" value="/data/bin" />
+        <option name="module-name" value="request_license_test" />
+        <option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+        <option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+    </test>
+</configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-service-certificate-unit.xml b/res/config/google/test/framework/media/widevine/tests/widevine-service-certificate-unit.xml
new file mode 100644
index 0000000..1a3d994
--- /dev/null
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-service-certificate-unit.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2015 Google Inc. All Rights Reserved -->
+<!-- Required options: branch build-flavor -->
+<configuration description="Downloads build, flashes on device, and runs Widevine Modular DRM tests">
+    <option name="test-tag" value="widevineServiceCertificateUnit" />
+    <target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
+        <option name="test-file-name" value="bin/service_certificate_unittest" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.GTest">
+        <option name="native-test-device-path" value="/data/bin" />
+        <option name="module-name" value="service_certificate_unittest" />
+        <option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+        <option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+    </test>
+</configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-timer-unit.xml b/res/config/google/test/framework/media/widevine/tests/widevine-timer-unit.xml
new file mode 100644
index 0000000..765a8b2
--- /dev/null
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-timer-unit.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2015 Google Inc. All Rights Reserved -->
+<!-- Required options: branch build-flavor -->
+<configuration description="Downloads build, flashes on device, and runs Widevine Modular DRM tests">
+    <option name="test-tag" value="widevineTimerUnit" />
+    <target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
+        <option name="test-file-name" value="bin/timer_unittest" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.GTest">
+        <option name="native-test-device-path" value="/data/bin" />
+        <option name="module-name" value="timer_unittest" />
+        <option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+        <option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+    </test>
+</configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-usage-table-header-unit.xml b/res/config/google/test/framework/media/widevine/tests/widevine-usage-table-header-unit.xml
new file mode 100644
index 0000000..159d6e0
--- /dev/null
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-usage-table-header-unit.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2015 Google Inc. All Rights Reserved -->
+<!-- Required options: branch build-flavor -->
+<configuration description="Downloads build, flashes on device, and runs Widevine Modular DRM tests">
+    <option name="test-tag" value="widevineUsageTableHeaderUnit" />
+    <target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
+        <option name="test-file-name" value="bin/usage_table_header_unittest" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.GTest">
+        <option name="native-test-device-path" value="/data/bin" />
+        <option name="module-name" value="usage_table_header_unittest" />
+        <option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+        <option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+    </test>
+</configuration>
diff --git a/res/config/google/test/framework/media/widevine/widevine-base.xml b/res/config/google/test/framework/media/widevine/widevine-base.xml
new file mode 100644
index 0000000..d69f7fc
--- /dev/null
+++ b/res/config/google/test/framework/media/widevine/widevine-base.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2015 Google Inc. All Rights Reserved -->
+<!-- Common base configuration for Widevine Media Tests. -->
+<configuration description="Common base Widevine configuration">
+    <build_provider class="com.google.android.tradefed.build.DeviceLaunchControlProvider" >
+        <option name="build-blacklist" value="/usr/local/google/home/widevine-tf-test/wvtradefed/test_configs/build_blacklist.txt" />
+    </build_provider>
+
+    <target_preparer class="com.google.android.tradefed.targetprep.GoogleDeviceFlashPreparer" >
+        <option name="userdata-flash" value="WIPE" />
+    </target_preparer>
+
+    <!-- ASIT preparer template uses the same options we require -->
+    <include name="google/template/preparers/asit" />
+
+    <option name="google-device-setup:wifi-network" value="GoogleGuest" />
+    <!-- <option name="google-device-setup:wifi-psk" value="password" /> -->
+
+    <template-include name="test" />
+
+    <include name="google/test/framework/media/widevine/reporters/widevine-reporter" />
+
+    <template-include name="reporters" default="empty" />
+</configuration>
diff --git a/res/config/google/test/framework/media/xts-stress.xml b/res/config/google/test/framework/media/xts-stress.xml
new file mode 100644
index 0000000..c8ebd4b
--- /dev/null
+++ b/res/config/google/test/framework/media/xts-stress.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2012 Google Inc. All Rights Reserved -->
+<configuration description="Runs xts stress tests">
+    <option name="test-tag" value="xts_stress_test" />
+
+    <!-- com.google.android.tradefed.targetprep.GoogleDeviceSetup -->
+    <option name="google-device-setup:screen-saver" value="off" />
+
+    <target_preparer class="com.android.tradefed.targetprep.InstallApkSetup">
+        <option name="apk-path" value="/google/data/ro/teams/tradefed/testdata/media/DrmMediaTests.apk" />
+    </target_preparer>
+
+    <test class="com.android.tradefed.testtype.InstrumentationTest">
+        <option name="class" value="com.google.android.wvdrm.media.test.MediaPlayerStressTest" />
+        <option name="method" value="testM2PS_H264_AAC_720P_WV_MULTI_720p_stress" />
+        <option name="package" value="com.google.android.wvdrm.media.test" />
+        <option name="runner" value="android.test.InstrumentationTestRunner" />
+        <option name="run-name" value="xts_stress_test" />
+        <option name="timeout" value="2000000" />
+        <option name="bugreport-on-failure" value="EACH" />
+    </test>
+</configuration>