Snap for 5285360 from 5d0c86de45f162da5e5b7ba55ed504122f6ed85a to pie-vts-release
Change-Id: I7635e1a5ddb6081512a60d5ccb0e95ec60e92723
diff --git a/res/config/google/media/media-stress-test.xml b/res/config/google/media/media-stress-test.xml
deleted file mode 100644
index 7127b9c..0000000
--- a/res/config/google/media/media-stress-test.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2011 Google Inc. All Rights Reserved -->
-<!-- Required options: branch build-flavor -->
-<configuration description="Downloads build, flashes on device, and runs media stress tests">
- <include name="google/common/asit" />
- <option name="test-tag" value="media_stress" />
- <option name="device-unavail-email:destination" value="jnoguchi@google.com" />
- <option name="google-device-setup:local-data-path" value="/google/data/ro/teams/tradefed/testdata/media/media_api/" />
- <option name="invocation-failure-email:destination" value="jnoguchi@google.com" />
- <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/media/video-multimeter-multi-test.xml b/res/config/google/media/video-multimeter-multi-test.xml
deleted file mode 100644
index 3db064e..0000000
--- a/res/config/google/media/video-multimeter-multi-test.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2017 Google Inc. All Rights Reserved -->
-<!-- Required options: branch build-flavor -->
-<configuration description="Run Video Multimeter test with plotter setup">
- <option name="test-tag" value="VideoMultimeter" />
-
- <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-system-setting" key="screen_brightness" value="230" />
- <option name="set-system-setting" key="volume_music_speaker" value="12" />
- <option name="set-system-setting" key="volume_music_headset" value="12" />
- <option name="set-system-setting" key="volume_music_headphone" value="12" />
- <option name="set-property" key="audio.safemedia.bypass" value="1"/>
- </target_preparer>
-
- <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
- </target_preparer>
-
- <target_preparer class="com.android.tradefed.targetprep.InstallApkSetup">
- <option name="apk-path" value="/google/data/ro/teams/tradefed/testdata/media/multimeter/mediaplayer.apk" />
- </target_preparer>
-
- <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
- <option name="push" value="/google/data/ro/teams/tradefed/testdata/media/multimeter/video_calibration.mp4->/sdcard/media_api/samples/video_cali.mp4" />
- <option name="push" value="/google/data/ro/teams/tradefed/testdata/media/multimeter/video_1080p_30fps_10min_bbb.mp4->/sdcard/media_api/samples/video.mp4" />
- <option name="push" value="/google/data/ro/teams/tradefed/testdata/media/multimeter/video_720p_60fps_4min_mountham.mp4->/sdcard/media_api/samples/video2.mp4" />
- </target_preparer>
-
- <test class="com.android.media.tests.VideoMultimeterRunner">
- <option name="multimeter-util-path" value="/google/data/ro/teams/tradefed/testdata/media/multimeter/optofi.sh" />
- <option name="robot-util-path" value="/google/data/ro/teams/tradefed/testdata/media/multimeter/mbplotter.sh" />
- <option name="start-video-cmd" value="am instrument -w -r -e media-file %s -e class com.android.mediaframeworktest.stress.MediaPlayerStressTest com.android.mediaframeworktest/.MediaPlayerStressTestRunner" />
- <option name="stop-video-cmd" value="am force-stop com.android.mediaframeworktest" />
- </test>
-</configuration>
diff --git a/res/config/google/preparers/amperf-preparers.xml b/res/config/google/preparers/amperf-preparers.xml
deleted file mode 100644
index 2db8f2d..0000000
--- a/res/config/google/preparers/amperf-preparers.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<configuration description="ActivityManager Performance Tests Target Preparers">
- <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup" />
- <target_preparer class="com.android.tradefed.targetprep.AddWhitelistPackage" />
-
- <include name="google/template/preparers/performance" />
-</configuration>
diff --git a/res/config/google/test/framework/media/adb-screen-record.xml b/res/config/google/test/framework/media/adb-screen-record.xml
deleted file mode 100644
index f7daa23..0000000
--- a/res/config/google/test/framework/media/adb-screen-record.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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-loopback-stress.xml b/res/config/google/test/framework/media/audio-loopback-stress.xml
deleted file mode 100644
index 25bd99f..0000000
--- a/res/config/google/test/framework/media/audio-loopback-stress.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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/widevine/reporters/widevine-reporter.xml b/res/config/google/test/framework/media/widevine/reporters/widevine-reporter.xml
deleted file mode 100644
index cfbc980..0000000
--- a/res/config/google/test/framework/media/widevine/reporters/widevine-reporter.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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/widevine-base.xml b/res/config/google/test/framework/media/widevine/widevine-base.xml
deleted file mode 100644
index d69f7fc..0000000
--- a/res/config/google/test/framework/media/widevine/widevine-base.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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>
