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

24 files changed, 25 insertions, 86 deletions

diff --git a/common/android-support-test/Android.mk b/common/android-support-test/Android.mk
index 27ef4858..edbff9a2 100644
--- a/common/android-support-test/Android.mk
+++ b/common/android-support-test/Android.mk
@@ -17,14 +17,9 @@ LOCAL_PATH:= $(call my-dir)
 # for Android JUnit runner and rules
 include $(CLEAR_VARS)
 LOCAL_MODULE := android-support-test
-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)
+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)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := android-support-test-nodep
@@ -35,10 +30,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-0.6-beta-2-release-no-dep.jar
+LOCAL_SRC_FILES := rules/rules_release_no_deps.jar
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
-LOCAL_SDK_VERSION := 8
+LOCAL_SDK_VERSION := 15
 # Uninstallable static Java libraries.
 LOCAL_UNINSTALLABLE_MODULE := true
 include $(BUILD_PREBUILT)
@@ -46,30 +41,26 @@ include $(BUILD_PREBUILT)
 include $(CLEAR_VARS)
 LOCAL_MODULE := android-support-test-runner-nodep
 LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := runner/runner-0.6-beta-2-release-no-dep.jar
+LOCAL_SRC_FILES := runner/runner_release_no_deps.jar
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
-LOCAL_SDK_VERSION := 8
+LOCAL_SDK_VERSION := 15
 # 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_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)
+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)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := espresso-core-nodep
 LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := espresso/espresso-core-2.3-beta-2-release-no-dep.jar
+LOCAL_SRC_FILES := espresso/espresso_core_release_no_deps.jar
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
 # Uninstallable static Java libraries.
@@ -77,21 +68,17 @@ 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_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)
+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)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := espresso-contrib-nodep
 LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := espresso/espresso-contrib-2.3-beta-2-release-no-dep.jar
+LOCAL_SRC_FILES := espresso/espresso_contrib_release_no_deps.jar
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
 # Uninstallable static Java libraries.
@@ -102,7 +89,7 @@ include $(BUILD_PREBUILT)
 include $(CLEAR_VARS)
 LOCAL_MODULE := espresso-idling-resource-nodep
 LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := espresso/espresso-idling-resource-2.3-beta-2-release-no-dep.jar
+LOCAL_SRC_FILES := espresso/espresso_idling_resource_release_no_deps.jar
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
 # Uninstallable static Java libraries.
@@ -110,21 +97,17 @@ 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_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)
+LOCAL_SDK_VERSION := 15
+LOCAL_STATIC_JAVA_LIBRARIES := espresso-intents-nodep espresso-core android-support-test-rules-nodep 
+include $(BUILD_STATIC_JAVA_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := espresso-intents-nodep
 LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := espresso/espresso-intents-2.3-beta-2-release-no-dep.jar
+LOCAL_SRC_FILES := espresso/espresso_intents_release_no_deps.jar
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
 # Uninstallable static Java libraries.
@@ -132,21 +115,17 @@ 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_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)
+LOCAL_SDK_VERSION := 15
+LOCAL_STATIC_JAVA_LIBRARIES := espresso-core android-support-annotations tagsoup-android
+include $(BUILD_STATIC_JAVA_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := espresso-web-nodep
 LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := espresso/espresso-web-2.3-beta-2-release-no-dep.jar
+LOCAL_SRC_FILES := espresso/espresso_web_release_no_deps.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 b53e1811..af29e0ea 100644
--- a/common/android-support-test/PREBUILT
+++ b/common/android-support-test/PREBUILT
@@ -1,6 +1 @@
-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
+Artifacts built from google3 atsl_6.0_alpha_2_release_branch
diff --git a/common/android-support-test/build.gradle b/common/android-support-test/build.gradle
deleted file mode 100644
index c030647c..00000000
--- a/common/android-support-test/build.gradle
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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
deleted file mode 100644
index 5f422b44..00000000
--- a/common/android-support-test/espresso/espresso-contrib-2.3-beta-2-release-no-dep.jar
+++ /dev/null
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
deleted file mode 100644
index d554a670..00000000
--- a/common/android-support-test/espresso/espresso-contrib-2.3-beta-2-release.jar
+++ /dev/null
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
deleted file mode 100644
index 239ab060..00000000
--- a/common/android-support-test/espresso/espresso-core-2.3-beta-2-release-no-dep.jar
+++ /dev/null
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
deleted file mode 100644
index 4d32d7c0..00000000
--- a/common/android-support-test/espresso/espresso-core-2.3-beta-2-release.jar
+++ /dev/null
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
deleted file mode 100644
index 11441b82..00000000
--- a/common/android-support-test/espresso/espresso-idling-resource-2.3-beta-2-release-no-dep.jar
+++ /dev/null
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
deleted file mode 100644
index 96e25c5f..00000000
--- a/common/android-support-test/espresso/espresso-intents-2.3-beta-2-release-no-dep.jar
+++ /dev/null
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
deleted file mode 100644
index 730a26c3..00000000
--- a/common/android-support-test/espresso/espresso-intents-2.3-beta-2-release.jar
+++ /dev/null
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
deleted file mode 100644
index 0a767985..00000000
--- a/common/android-support-test/espresso/espresso-web-2.3-beta-2-release-no-dep.jar
+++ /dev/null
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
deleted file mode 100644
index 23a1f30c..00000000
--- a/common/android-support-test/espresso/espresso-web-2.3-beta-2-release.jar
+++ /dev/null
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
new file mode 100755
index 00000000..eb741191
--- /dev/null
+++ b/common/android-support-test/espresso/espresso_contrib_release_no_deps.jar
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
new file mode 100755
index 00000000..a795f6ba
--- /dev/null
+++ b/common/android-support-test/espresso/espresso_core_release_no_deps.jar
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
new file mode 100755
index 00000000..bd844b17
--- /dev/null
+++ b/common/android-support-test/espresso/espresso_idling_resource_release_no_deps.jar
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
new file mode 100755
index 00000000..c87e5aac
--- /dev/null
+++ b/common/android-support-test/espresso/espresso_intents_release_no_deps.jar
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
new file mode 100755
index 00000000..8d6f92fb
--- /dev/null
+++ b/common/android-support-test/espresso/espresso_web_release_no_deps.jar
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
deleted file mode 100644
index 11627f35..00000000
--- a/common/android-support-test/espresso/exposed-instrumentation-api-publish-0.6-beta-2-release-no-dep.jar
+++ /dev/null
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
deleted file mode 100644
index 66ea86fb..00000000
--- a/common/android-support-test/rules/rules-0.6-beta-2-release-no-dep.jar
+++ /dev/null
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
deleted file mode 100644
index c8fbbfbb..00000000
--- a/common/android-support-test/rules/rules-0.6-beta-2-release.jar
+++ /dev/null
diff --git a/common/android-support-test/rules/rules_release_no_deps.jar b/common/android-support-test/rules/rules_release_no_deps.jar
new file mode 100755
index 00000000..8ad41ac1
--- /dev/null
+++ b/common/android-support-test/rules/rules_release_no_deps.jar
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
deleted file mode 100644
index 209ab48b..00000000
--- a/common/android-support-test/runner/runner-0.6-beta-2-release-no-dep.jar
+++ /dev/null
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
deleted file mode 100644
index ca28c462..00000000
--- a/common/android-support-test/runner/runner-0.6-beta-2-release.jar
+++ /dev/null
diff --git a/common/android-support-test/runner/runner_release_no_deps.jar b/common/android-support-test/runner/runner_release_no_deps.jar
new file mode 100755
index 00000000..9e538eed
--- /dev/null
+++ b/common/android-support-test/runner/runner_release_no_deps.jar