Revert "Merge "Update android-support-test prebuilts." into oreo-cts-dev am: 8d1bba5bee"

am: 19bb72bb04

Change-Id: I586204a507c302321b3a39f423151bfec391da1b

24 files changed, 86 insertions, 25 deletions

diff --git a/common/android-support-test/Android.mk b/common/android-support-test/Android.mk
index edbff9a2..27ef4858 100644
--- a/common/android-support-test/Android.mk
+++ b/common/android-support-test/Android.mk
@@ -17,9 +17,14 @@ LOCAL_PATH:= $(call my-dir)
 # for Android JUnit runner and rules
 include $(CLEAR_VARS)
 LOCAL_MODULE := android-support-test
-LOCAL_SDK_VERSION := 15
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test-rules-nodep android-support-test-runner-nodep junit hamcrest hamcrest-library android-support-annotations
-include $(BUILD_STATIC_JAVA_LIBRARY)
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := rules/rules-0.6-beta-2-release.jar
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
+LOCAL_SDK_VERSION := 8
+# Uninstallable static Java libraries.
+LOCAL_UNINSTALLABLE_MODULE := true
+include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := android-support-test-nodep
@@ -30,10 +35,10 @@ include $(BUILD_STATIC_JAVA_LIBRARY)
 include $(CLEAR_VARS)
 LOCAL_MODULE := android-support-test-rules-nodep
 LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := rules/rules_release_no_deps.jar
+LOCAL_SRC_FILES := rules/rules-0.6-beta-2-release-no-dep.jar
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
-LOCAL_SDK_VERSION := 15
+LOCAL_SDK_VERSION := 8
 # Uninstallable static Java libraries.
 LOCAL_UNINSTALLABLE_MODULE := true
 include $(BUILD_PREBUILT)
@@ -41,26 +46,30 @@ include $(BUILD_PREBUILT)
 include $(CLEAR_VARS)
 LOCAL_MODULE := android-support-test-runner-nodep
 LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := runner/runner_release_no_deps.jar
+LOCAL_SRC_FILES := runner/runner-0.6-beta-2-release-no-dep.jar
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
-LOCAL_SDK_VERSION := 15
+LOCAL_SDK_VERSION := 8
 # Uninstallable static Java libraries.
 LOCAL_UNINSTALLABLE_MODULE := true
 include $(BUILD_PREBUILT)
 
 # for espresso-core
+## Note: the following jar already contains android-support-test
 include $(CLEAR_VARS)
 LOCAL_MODULE := espresso-core
 LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := 15
-LOCAL_STATIC_JAVA_LIBRARIES := espresso-core-nodep android-support-test-rules-nodep android-support-test-runner-nodep junit hamcrest hamcrest-library android-support-annotations
-include $(BUILD_STATIC_JAVA_LIBRARY)
+LOCAL_SRC_FILES := espresso/espresso-core-2.3-beta-2-release.jar
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
+# Uninstallable static Java libraries.
+LOCAL_UNINSTALLABLE_MODULE := true
+include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := espresso-core-nodep
 LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := espresso/espresso_core_release_no_deps.jar
+LOCAL_SRC_FILES := espresso/espresso-core-2.3-beta-2-release-no-dep.jar
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
 # Uninstallable static Java libraries.
@@ -68,17 +77,21 @@ LOCAL_UNINSTALLABLE_MODULE := true
 include $(BUILD_PREBUILT)
 
 # for espresso-contrib
+## Note: the following jar already contains espresso-core
 include $(CLEAR_VARS)
 LOCAL_MODULE := espresso-contrib
 LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := 15
-LOCAL_STATIC_JAVA_LIBRARIES := espresso-core android-support-design android-support-v7-recyclerview android-support-v4
-include $(BUILD_STATIC_JAVA_LIBRARY)
+LOCAL_SRC_FILES := espresso/espresso-contrib-2.3-beta-2-release.jar
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
+# Uninstallable static Java libraries.
+LOCAL_UNINSTALLABLE_MODULE := true
+include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := espresso-contrib-nodep
 LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := espresso/espresso_contrib_release_no_deps.jar
+LOCAL_SRC_FILES := espresso/espresso-contrib-2.3-beta-2-release-no-dep.jar
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
 # Uninstallable static Java libraries.
@@ -89,7 +102,7 @@ include $(BUILD_PREBUILT)
 include $(CLEAR_VARS)
 LOCAL_MODULE := espresso-idling-resource-nodep
 LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := espresso/espresso_idling_resource_release_no_deps.jar
+LOCAL_SRC_FILES := espresso/espresso-idling-resource-2.3-beta-2-release-no-dep.jar
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
 # Uninstallable static Java libraries.
@@ -97,17 +110,21 @@ LOCAL_UNINSTALLABLE_MODULE := true
 include $(BUILD_PREBUILT)
 
 # for espresso-intents
+## Note: the following jar already contains espresso-core
 include $(CLEAR_VARS)
 LOCAL_MODULE := espresso-intents
 LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := 15
-LOCAL_STATIC_JAVA_LIBRARIES := espresso-intents-nodep espresso-core android-support-test-rules-nodep 
-include $(BUILD_STATIC_JAVA_LIBRARY)
+LOCAL_SRC_FILES := espresso/espresso-intents-2.3-beta-2-release.jar
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
+# Uninstallable static Java libraries.
+LOCAL_UNINSTALLABLE_MODULE := true
+include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := espresso-intents-nodep
 LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := espresso/espresso_intents_release_no_deps.jar
+LOCAL_SRC_FILES := espresso/espresso-intents-2.3-beta-2-release-no-dep.jar
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
 # Uninstallable static Java libraries.
@@ -115,17 +132,21 @@ LOCAL_UNINSTALLABLE_MODULE := true
 include $(BUILD_PREBUILT)
 
 # for espresso-web
+## Note: the following jar already contains espresso-core
 include $(CLEAR_VARS)
 LOCAL_MODULE := espresso-web
 LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := 15
-LOCAL_STATIC_JAVA_LIBRARIES := espresso-core android-support-annotations tagsoup-android
-include $(BUILD_STATIC_JAVA_LIBRARY)
+LOCAL_SRC_FILES := espresso/espresso-web-2.3-beta-2-release.jar
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
+# Uninstallable static Java libraries.
+LOCAL_UNINSTALLABLE_MODULE := true
+include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := espresso-web-nodep
 LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := espresso/espresso_web_release_no_deps.jar
+LOCAL_SRC_FILES := espresso/espresso-web-2.3-beta-2-release-no-dep.jar
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
 # Uninstallable static Java libraries.
diff --git a/common/android-support-test/PREBUILT b/common/android-support-test/PREBUILT
index af29e0ea..b53e1811 100644
--- a/common/android-support-test/PREBUILT
+++ b/common/android-support-test/PREBUILT
@@ -1 +1,6 @@
-Artifacts built from google3 atsl_6.0_alpha_2_release_branch
+The object in this prebuilt directory can be rebuilt from:
+	platform/frameworks/testing/ on ub-support-test-release branch
+
+From the revision: 19c5dcc0faf42f1b16485870e68e10bb37d5dcfc
+
+ub-support-test-release branch build number: 3569502
diff --git a/common/android-support-test/build.gradle b/common/android-support-test/build.gradle
new file mode 100644
index 00000000..c030647c
--- /dev/null
+++ b/common/android-support-test/build.gradle
@@ -0,0 +1,35 @@
+/*
+ * WARNING: This file is deprecated! it’s here for legacy purposes only.
+ * All Android Testing Libraries should be used from the Android Maven repository,
+ * the same way you would use the Support Libraries.
+ *
+ * If you're compiling against current and the prerelease versions of the Support Libraries
+ * (using Jars in "prebuilts/sdk/current/support") then you should explicitly exclude your
+ * "support-annotations" dependency.
+ *
+ * An example of how to configure your project can be found here:
+ * go/config-atsl-deps (https://bit.googleplex.com/#/nkorsote/5894271450218496)
+ */
+
+// To use the test runner and test rules add the following dependency:
+//     compile project(":android-support-test")
+// where "android-support-test" is the name you defined in your settings.gradle file
+if (!configurations.findByName("default")) {
+    configurations.create("default")
+}
+artifacts.add("default", file("runner/runner-0.6-beta-2-release.jar"))
+artifacts.add("default", file("rules/rules-0.6-beta-2-release.jar"))
+
+// To use the "android-support-test.jar" and the "esspresso-core.jar" add the following dependency:
+//     compile project(path: ":android-support-test", configuration: "espresso-core")
+if (!configurations.findByName("espresso-core")) {
+    configurations.create("espresso-core")
+}
+artifacts.add("espresso-core", file("espresso/espresso-core-0.6-beta-2-release.jar"))
+
+// To use the "runner-no-dep.jar", add the following dependency:
+//     compile project(path: ":android-support-test", configuration: "runner-no-dep")
+if (!configurations.findByName("runner-no-dep")) {
+    configurations.create("runner-no-dep")
+}
+artifacts.add("runner-no-dep", file("runner/runner-0.6-beta-2-release-no-dep.jar"))
diff --git a/common/android-support-test/espresso/espresso-contrib-2.3-beta-2-release-no-dep.jar b/common/android-support-test/espresso/espresso-contrib-2.3-beta-2-release-no-dep.jar
new file mode 100644
index 00000000..5f422b44
--- /dev/null
+++ b/common/android-support-test/espresso/espresso-contrib-2.3-beta-2-release-no-dep.jar
diff --git a/common/android-support-test/espresso/espresso-contrib-2.3-beta-2-release.jar b/common/android-support-test/espresso/espresso-contrib-2.3-beta-2-release.jar
new file mode 100644
index 00000000..d554a670
--- /dev/null
+++ b/common/android-support-test/espresso/espresso-contrib-2.3-beta-2-release.jar
diff --git a/common/android-support-test/espresso/espresso-core-2.3-beta-2-release-no-dep.jar b/common/android-support-test/espresso/espresso-core-2.3-beta-2-release-no-dep.jar
new file mode 100644
index 00000000..239ab060
--- /dev/null
+++ b/common/android-support-test/espresso/espresso-core-2.3-beta-2-release-no-dep.jar
diff --git a/common/android-support-test/espresso/espresso-core-2.3-beta-2-release.jar b/common/android-support-test/espresso/espresso-core-2.3-beta-2-release.jar
new file mode 100644
index 00000000..4d32d7c0
--- /dev/null
+++ b/common/android-support-test/espresso/espresso-core-2.3-beta-2-release.jar
diff --git a/common/android-support-test/espresso/espresso-idling-resource-2.3-beta-2-release-no-dep.jar b/common/android-support-test/espresso/espresso-idling-resource-2.3-beta-2-release-no-dep.jar
new file mode 100644
index 00000000..11441b82
--- /dev/null
+++ b/common/android-support-test/espresso/espresso-idling-resource-2.3-beta-2-release-no-dep.jar
diff --git a/common/android-support-test/espresso/espresso-intents-2.3-beta-2-release-no-dep.jar b/common/android-support-test/espresso/espresso-intents-2.3-beta-2-release-no-dep.jar
new file mode 100644
index 00000000..96e25c5f
--- /dev/null
+++ b/common/android-support-test/espresso/espresso-intents-2.3-beta-2-release-no-dep.jar
diff --git a/common/android-support-test/espresso/espresso-intents-2.3-beta-2-release.jar b/common/android-support-test/espresso/espresso-intents-2.3-beta-2-release.jar
new file mode 100644
index 00000000..730a26c3
--- /dev/null
+++ b/common/android-support-test/espresso/espresso-intents-2.3-beta-2-release.jar
diff --git a/common/android-support-test/espresso/espresso-web-2.3-beta-2-release-no-dep.jar b/common/android-support-test/espresso/espresso-web-2.3-beta-2-release-no-dep.jar
new file mode 100644
index 00000000..0a767985
--- /dev/null
+++ b/common/android-support-test/espresso/espresso-web-2.3-beta-2-release-no-dep.jar
diff --git a/common/android-support-test/espresso/espresso-web-2.3-beta-2-release.jar b/common/android-support-test/espresso/espresso-web-2.3-beta-2-release.jar
new file mode 100644
index 00000000..23a1f30c
--- /dev/null
+++ b/common/android-support-test/espresso/espresso-web-2.3-beta-2-release.jar
diff --git a/common/android-support-test/espresso/espresso_contrib_release_no_deps.jar b/common/android-support-test/espresso/espresso_contrib_release_no_deps.jar
deleted file mode 100755
index eb741191..00000000
--- a/common/android-support-test/espresso/espresso_contrib_release_no_deps.jar
+++ /dev/null
diff --git a/common/android-support-test/espresso/espresso_core_release_no_deps.jar b/common/android-support-test/espresso/espresso_core_release_no_deps.jar
deleted file mode 100755
index a795f6ba..00000000
--- a/common/android-support-test/espresso/espresso_core_release_no_deps.jar
+++ /dev/null
diff --git a/common/android-support-test/espresso/espresso_idling_resource_release_no_deps.jar b/common/android-support-test/espresso/espresso_idling_resource_release_no_deps.jar
deleted file mode 100755
index bd844b17..00000000
--- a/common/android-support-test/espresso/espresso_idling_resource_release_no_deps.jar
+++ /dev/null
diff --git a/common/android-support-test/espresso/espresso_intents_release_no_deps.jar b/common/android-support-test/espresso/espresso_intents_release_no_deps.jar
deleted file mode 100755
index c87e5aac..00000000
--- a/common/android-support-test/espresso/espresso_intents_release_no_deps.jar
+++ /dev/null
diff --git a/common/android-support-test/espresso/espresso_web_release_no_deps.jar b/common/android-support-test/espresso/espresso_web_release_no_deps.jar
deleted file mode 100755
index 8d6f92fb..00000000
--- a/common/android-support-test/espresso/espresso_web_release_no_deps.jar
+++ /dev/null
diff --git a/common/android-support-test/espresso/exposed-instrumentation-api-publish-0.6-beta-2-release-no-dep.jar b/common/android-support-test/espresso/exposed-instrumentation-api-publish-0.6-beta-2-release-no-dep.jar
new file mode 100644
index 00000000..11627f35
--- /dev/null
+++ b/common/android-support-test/espresso/exposed-instrumentation-api-publish-0.6-beta-2-release-no-dep.jar
diff --git a/common/android-support-test/rules/rules-0.6-beta-2-release-no-dep.jar b/common/android-support-test/rules/rules-0.6-beta-2-release-no-dep.jar
new file mode 100644
index 00000000..66ea86fb
--- /dev/null
+++ b/common/android-support-test/rules/rules-0.6-beta-2-release-no-dep.jar
diff --git a/common/android-support-test/rules/rules-0.6-beta-2-release.jar b/common/android-support-test/rules/rules-0.6-beta-2-release.jar
new file mode 100644
index 00000000..c8fbbfbb
--- /dev/null
+++ b/common/android-support-test/rules/rules-0.6-beta-2-release.jar
diff --git a/common/android-support-test/rules/rules_release_no_deps.jar b/common/android-support-test/rules/rules_release_no_deps.jar
deleted file mode 100755
index 8ad41ac1..00000000
--- a/common/android-support-test/rules/rules_release_no_deps.jar
+++ /dev/null
diff --git a/common/android-support-test/runner/runner-0.6-beta-2-release-no-dep.jar b/common/android-support-test/runner/runner-0.6-beta-2-release-no-dep.jar
new file mode 100644
index 00000000..209ab48b
--- /dev/null
+++ b/common/android-support-test/runner/runner-0.6-beta-2-release-no-dep.jar
diff --git a/common/android-support-test/runner/runner-0.6-beta-2-release.jar b/common/android-support-test/runner/runner-0.6-beta-2-release.jar
new file mode 100644
index 00000000..ca28c462
--- /dev/null
+++ b/common/android-support-test/runner/runner-0.6-beta-2-release.jar
diff --git a/common/android-support-test/runner/runner_release_no_deps.jar b/common/android-support-test/runner/runner_release_no_deps.jar
deleted file mode 100755
index 9e538eed..00000000
--- a/common/android-support-test/runner/runner_release_no_deps.jar
+++ /dev/null