Skip to content

Commit

Permalink
Add hamcrest to chromium third party
Browse files Browse the repository at this point in the history
BUG=579638

Review-Url: https://codereview.chromium.org/2039623003
Cr-Commit-Position: refs/heads/master@{#401734}
  • Loading branch information
yolandyan authored and Commit bot committed Jun 23, 2016
1 parent 283dda1 commit 9243ece
Show file tree
Hide file tree
Showing 9 changed files with 85 additions and 0 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 10 additions & 0 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -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': '.',
Expand Down
25 changes: 25 additions & 0 deletions third_party/hamcrest/BUILD.gn
Original file line number Diff line number Diff line change
@@ -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"
}
27 changes: 27 additions & 0 deletions third_party/hamcrest/LICENSE
Original file line number Diff line number Diff line change
@@ -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.
3 changes: 3 additions & 0 deletions third_party/hamcrest/OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
jbudorick@chromium.org
mikecase@chromium.org
yolandyan@chromium.org
16 changes: 16 additions & 0 deletions third_party/hamcrest/README.chromium
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions third_party/hamcrest/lib/hamcrest-core-1.3.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
859db73d92c486964e00ee4a62108312112933e2
1 change: 1 addition & 0 deletions third_party/hamcrest/lib/hamcrest-integration-1.3.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
65460ac48fa7bdd1fb15b71b87ccc012b28a9a08
1 change: 1 addition & 0 deletions third_party/hamcrest/lib/hamcrest-library-1.3.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d6ccbe0b4605d06b48576646e5de038ef24eb833

0 comments on commit 9243ece

Please sign in to comment.