Revert "Migrate Animation Tests to CTSv2"
This reverts commit 0ed00ec5fb087eecade42ed1bcef962f83d23e1e.
Change-Id: Id45d2999b7d9507f21053aaf87ee0ea84531a5e4
diff --git a/tests/tests/animation/Android.mk b/tests/tests/animation/Android.mk
index 35b9312..3d8daf7 100644
--- a/tests/tests/animation/Android.mk
+++ b/tests/tests/animation/Android.mk
@@ -28,9 +28,6 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src)
-# Tag this module as a cts_v2 test artifact
-LOCAL_COMPATIBILITY_SUITE := cts_v2
-
LOCAL_SDK_VERSION := current
include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/animation/AndroidManifest.xml b/tests/tests/animation/AndroidManifest.xml
index 70f9de0..fdc5ad9 100644
--- a/tests/tests/animation/AndroidManifest.xml
+++ b/tests/tests/animation/AndroidManifest.xml
@@ -15,7 +15,7 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.animation.cts">
+ package="com.android.cts.animation">
<uses-sdk android:minSdkVersion="11" />
<uses-permission android:name="android.permission.INJECT_EVENTS" />
<uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
@@ -28,7 +28,7 @@
</application>
<instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.animation.cts"
+ android:targetPackage="com.android.cts.animation"
android:label="CTS tests for android.animation package">
<meta-data android:name="listener"
android:value="com.android.cts.runner.CtsTestRunListener" />
diff --git a/tests/tests/animation/AndroidTest.xml b/tests/tests/animation/AndroidTest.xml
deleted file mode 100644
index 1539077..0000000
--- a/tests/tests/animation/AndroidTest.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 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="Configuration for Animation Tests">
- <include name="common-config" />
- <option name="apk-installer:test-file-name" value="CtsAnimationTestCases.apk" />
- <test class="com.android.tradefed.testtype.InstrumentationTest" >
- <option name="package" value="android.animation.cts" />
- <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />
- </test>
-</configuration>
-
