Merge "Add asm-commons-5.0 prebuilt binary"
diff --git a/common/android-support-test/Android.mk b/common/android-support-test/Android.mk
index b17632c..27ef485 100644
--- a/common/android-support-test/Android.mk
+++ b/common/android-support-test/Android.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2014 The Android Open Source Project
+# Copyright (C) 2016 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.
@@ -18,7 +18,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE := android-support-test
LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := rules/rules-0.5-release.jar
+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
@@ -35,7 +35,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE := android-support-test-rules-nodep
LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := rules/rules-0.5-release-no-dep.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 := 8
@@ -46,7 +46,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE := android-support-test-runner-nodep
LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := runner/runner-0.5-release-no-dep.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 := 8
@@ -59,7 +59,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE := espresso-core
LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := espresso/espresso-core-2.2.2-release.jar
+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.
@@ -69,7 +69,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE := espresso-core-nodep
LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := espresso/espresso-core-2.2.2-release-no-dep.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.
@@ -81,7 +81,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE := espresso-contrib
LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := espresso/espresso-contrib-2.2.2-release.jar
+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.
@@ -91,7 +91,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE := espresso-contrib-nodep
LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := espresso/espresso-contrib-2.2.2-release-no-dep.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.
@@ -102,7 +102,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE := espresso-idling-resource-nodep
LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := espresso/espresso-idling-resource-2.2.2-release-no-dep.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.
@@ -114,7 +114,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE := espresso-intents
LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := espresso/espresso-intents-2.2.2-release.jar
+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.
@@ -124,7 +124,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE := espresso-intents-nodep
LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := espresso/espresso-intents-2.2.2-release-no-dep.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.
@@ -136,7 +136,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE := espresso-web
LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := espresso/espresso-web-2.2.2-release.jar
+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.
@@ -146,7 +146,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE := espresso-web-nodep
LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := espresso/espresso-web-2.2.2-release-no-dep.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 811d9d3..b53e181 100644
--- a/common/android-support-test/PREBUILT
+++ b/common/android-support-test/PREBUILT
@@ -1,6 +1,6 @@
The object in this prebuilt directory can be rebuilt from:
platform/frameworks/testing/ on ub-support-test-release branch
-From the revision: 07e957b4a36ff96b05f0b6e663f49b751b812821
+From the revision: 19c5dcc0faf42f1b16485870e68e10bb37d5dcfc
-ub-support-test-release branch build number: 2931722
+ub-support-test-release branch build number: 3569502
diff --git a/common/android-support-test/build.gradle b/common/android-support-test/build.gradle
index 6e4e806..c030647 100644
--- a/common/android-support-test/build.gradle
+++ b/common/android-support-test/build.gradle
@@ -17,19 +17,19 @@
if (!configurations.findByName("default")) {
configurations.create("default")
}
-artifacts.add("default", file("runner/runner-0.5-release.jar"))
-artifacts.add("default", file("rules/rules-0.5-release.jar"))
+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-2.2.2-release.jar"))
+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.5-release-no-dep.jar"))
+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 0000000..5f422b4
--- /dev/null
+++ b/common/android-support-test/espresso/espresso-contrib-2.3-beta-2-release-no-dep.jar
Binary files differ
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 0000000..d554a67
--- /dev/null
+++ b/common/android-support-test/espresso/espresso-contrib-2.3-beta-2-release.jar
Binary files differ
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 0000000..239ab06
--- /dev/null
+++ b/common/android-support-test/espresso/espresso-core-2.3-beta-2-release-no-dep.jar
Binary files differ
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 0000000..4d32d7c
--- /dev/null
+++ b/common/android-support-test/espresso/espresso-core-2.3-beta-2-release.jar
Binary files differ
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 0000000..11441b8
--- /dev/null
+++ b/common/android-support-test/espresso/espresso-idling-resource-2.3-beta-2-release-no-dep.jar
Binary files differ
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 0000000..96e25c5
--- /dev/null
+++ b/common/android-support-test/espresso/espresso-intents-2.3-beta-2-release-no-dep.jar
Binary files differ
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 0000000..730a26c
--- /dev/null
+++ b/common/android-support-test/espresso/espresso-intents-2.3-beta-2-release.jar
Binary files differ
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 0000000..0a76798
--- /dev/null
+++ b/common/android-support-test/espresso/espresso-web-2.3-beta-2-release-no-dep.jar
Binary files differ
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 0000000..23a1f30
--- /dev/null
+++ b/common/android-support-test/espresso/espresso-web-2.3-beta-2-release.jar
Binary files differ
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 0000000..11627f3
--- /dev/null
+++ b/common/android-support-test/espresso/exposed-instrumentation-api-publish-0.6-beta-2-release-no-dep.jar
Binary files differ
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 0000000..66ea86f
--- /dev/null
+++ b/common/android-support-test/rules/rules-0.6-beta-2-release-no-dep.jar
Binary files differ
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 0000000..c8fbbfb
--- /dev/null
+++ b/common/android-support-test/rules/rules-0.6-beta-2-release.jar
Binary files differ
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 0000000..209ab48
--- /dev/null
+++ b/common/android-support-test/runner/runner-0.6-beta-2-release-no-dep.jar
Binary files differ
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 0000000..ca28c46
--- /dev/null
+++ b/common/android-support-test/runner/runner-0.6-beta-2-release.jar
Binary files differ
