From 9243ece530d7579778032e4e15877b8d3fd61f0c Mon Sep 17 00:00:00 2001 From: yolandyan Date: Thu, 23 Jun 2016 14:45:01 -0700 Subject: [PATCH] Add hamcrest to chromium third party BUG=579638 Review-Url: https://codereview.chromium.org/2039623003 Cr-Commit-Position: refs/heads/master@{#401734} --- .gitignore | 1 + DEPS | 10 +++++++ third_party/hamcrest/BUILD.gn | 25 +++++++++++++++++ third_party/hamcrest/LICENSE | 27 +++++++++++++++++++ third_party/hamcrest/OWNERS | 3 +++ third_party/hamcrest/README.chromium | 16 +++++++++++ .../hamcrest/lib/hamcrest-core-1.3.jar.sha1 | 1 + .../lib/hamcrest-integration-1.3.jar.sha1 | 1 + .../lib/hamcrest-library-1.3.jar.sha1 | 1 + 9 files changed, 85 insertions(+) create mode 100644 third_party/hamcrest/BUILD.gn create mode 100644 third_party/hamcrest/LICENSE create mode 100644 third_party/hamcrest/OWNERS create mode 100644 third_party/hamcrest/README.chromium create mode 100644 third_party/hamcrest/lib/hamcrest-core-1.3.jar.sha1 create mode 100644 third_party/hamcrest/lib/hamcrest-integration-1.3.jar.sha1 create mode 100644 third_party/hamcrest/lib/hamcrest-library-1.3.jar.sha1 diff --git a/.gitignore b/.gitignore index 4b31858d37a9b0..4416670e59eb2c 100644 --- a/.gitignore +++ b/.gitignore @@ -343,6 +343,7 @@ vs-chromium-project.txt /third_party/gperf /third_party/grpc /third_party/guava/lib/*.jar +/third_party/hamcrest/lib/*.jar /third_party/httpcomponents-client /third_party/httpcomponents-core /third_party/hunspell_dictionaries diff --git a/DEPS b/DEPS index b1ccd6c1fc0565..ea5a2f7ae0a52e 100644 --- a/DEPS +++ b/DEPS @@ -596,6 +596,16 @@ hooks = [ '-l', 'third_party/javax_inject' ], }, + { + 'name': 'hamcrest', + 'pattern': '.', + 'action': ['python', + 'src/build/android/update_deps/update_third_party_deps.py', + 'download', + '-b', 'chromium-hamcrest', + '-l', 'third_party/hamcrest' + ], + }, { 'name': 'guava', 'pattern': '.', diff --git a/third_party/hamcrest/BUILD.gn b/third_party/hamcrest/BUILD.gn new file mode 100644 index 00000000000000..a7922978cde43d --- /dev/null +++ b/third_party/hamcrest/BUILD.gn @@ -0,0 +1,25 @@ +# Copyright 2016 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/android/rules.gni") + +group("hamcrest_java") { + public_deps = [ + ":hamcrest_core_java", + ":hamcrest_integration_java", + ":hamcrest_library_java", + ] +} + +android_java_prebuilt("hamcrest_core_java") { + jar_path = "lib/hamcrest-core-1.3.jar" +} + +android_java_prebuilt("hamcrest_integration_java") { + jar_path = "lib/hamcrest-integration-1.3.jar" +} + +android_java_prebuilt("hamcrest_library_java") { + jar_path = "lib/hamcrest-library-1.3.jar" +} diff --git a/third_party/hamcrest/LICENSE b/third_party/hamcrest/LICENSE new file mode 100644 index 00000000000000..4933bda5bac2f5 --- /dev/null +++ b/third_party/hamcrest/LICENSE @@ -0,0 +1,27 @@ +BSD License + +Copyright (c) 2000-2015 www.hamcrest.org +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this list of +conditions and the following disclaimer. Redistributions in binary form must reproduce +the above copyright notice, this list of conditions and the following disclaimer in +the documentation and/or other materials provided with the distribution. + +Neither the name of Hamcrest nor the names of its contributors may be used to endorse +or promote products derived from this software without specific prior written +permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY +EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED +TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY +WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +DAMAGE. diff --git a/third_party/hamcrest/OWNERS b/third_party/hamcrest/OWNERS new file mode 100644 index 00000000000000..2cfd26c3b9113d --- /dev/null +++ b/third_party/hamcrest/OWNERS @@ -0,0 +1,3 @@ +jbudorick@chromium.org +mikecase@chromium.org +yolandyan@chromium.org diff --git a/third_party/hamcrest/README.chromium b/third_party/hamcrest/README.chromium new file mode 100644 index 00000000000000..70e44a7dfffd9e --- /dev/null +++ b/third_party/hamcrest/README.chromium @@ -0,0 +1,16 @@ +Name: Java Hamcrest +Short Name: hamcrest +URL: http://hamcrest.org/JavaHamcrest/ +Version: 1.3 +License: BSD 3-Clause +License File: NOT_SHIPPED +Security Critical: no +License Android Compatible: yes + +Description: +Hamcrest is a library of matchers, which can be combined in to create flexible +expressions of intent in tests. They've also been used for other purposes. +IMPORTANT: There should only be one version of espresso library +(crbug.com/622057) + +Local Modifications: None diff --git a/third_party/hamcrest/lib/hamcrest-core-1.3.jar.sha1 b/third_party/hamcrest/lib/hamcrest-core-1.3.jar.sha1 new file mode 100644 index 00000000000000..0881850668d542 --- /dev/null +++ b/third_party/hamcrest/lib/hamcrest-core-1.3.jar.sha1 @@ -0,0 +1 @@ +859db73d92c486964e00ee4a62108312112933e2 \ No newline at end of file diff --git a/third_party/hamcrest/lib/hamcrest-integration-1.3.jar.sha1 b/third_party/hamcrest/lib/hamcrest-integration-1.3.jar.sha1 new file mode 100644 index 00000000000000..c40312801cd6a3 --- /dev/null +++ b/third_party/hamcrest/lib/hamcrest-integration-1.3.jar.sha1 @@ -0,0 +1 @@ +65460ac48fa7bdd1fb15b71b87ccc012b28a9a08 \ No newline at end of file diff --git a/third_party/hamcrest/lib/hamcrest-library-1.3.jar.sha1 b/third_party/hamcrest/lib/hamcrest-library-1.3.jar.sha1 new file mode 100644 index 00000000000000..9d6dc9eefe4b2d --- /dev/null +++ b/third_party/hamcrest/lib/hamcrest-library-1.3.jar.sha1 @@ -0,0 +1 @@ +d6ccbe0b4605d06b48576646e5de038ef24eb833 \ No newline at end of file