Revert "Merge "Update android-support-test prebuilts." into oreo-cts-dev am: 8d1bba5bee" am: 19bb72bb04
am: b98d4f052a -s ours
Change-Id: If4c4f3fd932c9020d53f5f49252f3e852001575d
diff --git a/common/android-support-test/Android.mk b/common/android-support-test/Android.mk
index 27ef485..12becdd 100644
--- a/common/android-support-test/Android.mk
+++ b/common/android-support-test/Android.mk
@@ -17,14 +17,9 @@
# 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 $(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 $(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 espresso-idling-resource-nodep android-support-test-rules-nodep android-support-test-runner-nodep junit hamcrest hamcrest-library android-support-annotations jsr330
+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 @@
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 $(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 @@
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 @@
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 b53e181..af29e0e 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 c030647..0000000
--- 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 5f422b4..0000000
--- a/common/android-support-test/espresso/espresso-contrib-2.3-beta-2-release-no-dep.jar
+++ /dev/null
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
deleted file mode 100644
index d554a67..0000000
--- a/common/android-support-test/espresso/espresso-contrib-2.3-beta-2-release.jar
+++ /dev/null
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
deleted file mode 100644
index 239ab06..0000000
--- a/common/android-support-test/espresso/espresso-core-2.3-beta-2-release-no-dep.jar
+++ /dev/null
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
deleted file mode 100644
index 4d32d7c..0000000
--- a/common/android-support-test/espresso/espresso-core-2.3-beta-2-release.jar
+++ /dev/null
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
deleted file mode 100644
index 11441b8..0000000
--- a/common/android-support-test/espresso/espresso-idling-resource-2.3-beta-2-release-no-dep.jar
+++ /dev/null
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
deleted file mode 100644
index 96e25c5..0000000
--- a/common/android-support-test/espresso/espresso-intents-2.3-beta-2-release-no-dep.jar
+++ /dev/null
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
deleted file mode 100644
index 730a26c..0000000
--- a/common/android-support-test/espresso/espresso-intents-2.3-beta-2-release.jar
+++ /dev/null
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
deleted file mode 100644
index 0a76798..0000000
--- a/common/android-support-test/espresso/espresso-web-2.3-beta-2-release-no-dep.jar
+++ /dev/null
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
deleted file mode 100644
index 23a1f30..0000000
--- a/common/android-support-test/espresso/espresso-web-2.3-beta-2-release.jar
+++ /dev/null
Binary files differ
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 0000000..eb74119
--- /dev/null
+++ b/common/android-support-test/espresso/espresso_contrib_release_no_deps.jar
Binary files differ
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 0000000..a795f6b
--- /dev/null
+++ b/common/android-support-test/espresso/espresso_core_release_no_deps.jar
Binary files differ
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 0000000..bd844b1
--- /dev/null
+++ b/common/android-support-test/espresso/espresso_idling_resource_release_no_deps.jar
Binary files differ
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 0000000..c87e5aa
--- /dev/null
+++ b/common/android-support-test/espresso/espresso_intents_release_no_deps.jar
Binary files differ
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 0000000..8d6f92f
--- /dev/null
+++ b/common/android-support-test/espresso/espresso_web_release_no_deps.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
deleted file mode 100644
index 11627f3..0000000
--- a/common/android-support-test/espresso/exposed-instrumentation-api-publish-0.6-beta-2-release-no-dep.jar
+++ /dev/null
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
deleted file mode 100644
index 66ea86f..0000000
--- a/common/android-support-test/rules/rules-0.6-beta-2-release-no-dep.jar
+++ /dev/null
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
deleted file mode 100644
index c8fbbfb..0000000
--- a/common/android-support-test/rules/rules-0.6-beta-2-release.jar
+++ /dev/null
Binary files differ
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 0000000..8ad41ac
--- /dev/null
+++ b/common/android-support-test/rules/rules_release_no_deps.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
deleted file mode 100644
index 209ab48..0000000
--- a/common/android-support-test/runner/runner-0.6-beta-2-release-no-dep.jar
+++ /dev/null
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
deleted file mode 100644
index ca28c46..0000000
--- a/common/android-support-test/runner/runner-0.6-beta-2-release.jar
+++ /dev/null
Binary files differ
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 0000000..9e538ee
--- /dev/null
+++ b/common/android-support-test/runner/runner_release_no_deps.jar
Binary files differ
diff --git a/common/args4j/Android.mk b/common/args4j/Android.mk
new file mode 100644
index 0000000..c81bef7
--- /dev/null
+++ b/common/args4j/Android.mk
@@ -0,0 +1,22 @@
+# Copyright (C) 2017 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \
+ args4j-2.0.28:args4j-2.0.28.jar\
+
+include $(BUILD_HOST_PREBUILT)
diff --git a/common/args4j/LICENSE b/common/args4j/LICENSE
new file mode 100644
index 0000000..c49840b
--- /dev/null
+++ b/common/args4j/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2013 Kohsuke Kawaguchi and other contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/common/args4j/PREBUILT b/common/args4j/PREBUILT
new file mode 100644
index 0000000..a018f90
--- /dev/null
+++ b/common/args4j/PREBUILT
@@ -0,0 +1,2 @@
+Code from https://github.com/kohsuke/args4j
+Binary from http://central.maven.org/maven2/args4j/args4j/2.0.28/args4j-2.0.28.jar
diff --git a/common/args4j/args4j-2.0.28.jar b/common/args4j/args4j-2.0.28.jar
new file mode 100644
index 0000000..09f69b2
--- /dev/null
+++ b/common/args4j/args4j-2.0.28.jar
Binary files differ
diff --git a/linux-x86/relocation_packer/relocation_packer b/linux-x86/relocation_packer/relocation_packer
index bd549b1..735c2de 100755
--- a/linux-x86/relocation_packer/relocation_packer
+++ b/linux-x86/relocation_packer/relocation_packer
Binary files differ
