diff options
| author | kjellander <kjellander@chromium.org> | 2015-04-28 02:38:10 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-28 09:38:05 +0000 |
| commit | 0cb254911980cce90b2e5c7207a37a27420e9ea7 (patch) | |
| tree | fbbd4b560c96846615015214c038dd20e642af7c | |
| parent | 151fdce9acc177ad20f223f13b74dbcfde50a76e (diff) | |
| download | chromium_src-0cb254911980cce90b2e5c7207a37a27420e9ea7.zip chromium_src-0cb254911980cce90b2e5c7207a37a27420e9ea7.tar.gz chromium_src-0cb254911980cce90b2e5c7207a37a27420e9ea7.tar.bz2 | |
Move JUnit to 'unix' condition in DEPS.
This makes it possible to use the JUnit library from
Java code on Linux.
BUG=webrtc:4499
Review URL: https://codereview.chromium.org/1106973002
Cr-Commit-Position: refs/heads/master@{#327252}
| -rw-r--r-- | DEPS | 6 | ||||
| -rwxr-xr-x | tools/checklicenses/checklicenses.py | 4 |
2 files changed, 7 insertions, 3 deletions
@@ -399,6 +399,9 @@ deps_os = { 'src/chrome/tools/test/reference_build/chrome_linux': Var('chromium_git') + '/chromium/reference_builds/chrome_linux64.git' + '@' + '033d053a528e820e1de3e2db766678d862a86b36', + 'src/third_party/junit/src': + Var('chromium_git') + '/external/junit.git' + '@' + '45a44647e7306262162e1346b750c3209019f2e1', + 'src/third_party/xdg-utils': Var('chromium_git') + '/chromium/deps/xdg-utils.git' + '@' + 'd80274d5869b17b8c9067a1022e4416ee7ed5e0d', @@ -471,9 +474,6 @@ deps_os = { 'src/third_party/jsr-305/src': Var('chromium_git') + '/external/jsr-305.git' + '@' + '642c508235471f7220af6d5df2d3210e3bfc0919', - 'src/third_party/junit/src': - Var('chromium_git') + '/external/junit.git' + '@' + '45a44647e7306262162e1346b750c3209019f2e1', - 'src/third_party/mockito/src': Var('chromium_git') + '/external/mockito/mockito.git' + '@' + 'ed99a52e94a84bd7c467f2443b475a22fcc6ba8e', diff --git a/tools/checklicenses/checklicenses.py b/tools/checklicenses/checklicenses.py index da3d794..559ff4b 100755 --- a/tools/checklicenses/checklicenses.py +++ b/tools/checklicenses/checklicenses.py @@ -217,6 +217,10 @@ PATH_SPECIFIC_WHITELISTED_LICENSES = { # https://github.com/open-source-parsers/jsoncpp/issues/234 'UNKNOWN', ], + 'third_party/junit/src': [ + # https://github.com/junit-team/junit/issues/1132 + 'UNKNOWN', + ], 'third_party/lcov': [ # http://crbug.com/98304 'UNKNOWN', ], |