diff options
| author | Henrik Kjellander <kjellander@webrtc.org> | 2015-04-29 14:47:53 +0200 |
|---|---|---|
| committer | Henrik Kjellander <kjellander@webrtc.org> | 2015-04-29 12:48:00 +0000 |
| commit | 10ba3eec5a268d359260e331fcc2608f818d5236 (patch) | |
| tree | c0591e991534f7e07455625c76bf22872f710a9f /DEPS | |
| parent | dea11f9c4351b8cea0ee351d66376ad6dde123de (diff) | |
| download | webrtc-10ba3eec5a268d359260e331fcc2608f818d5236.tar.gz | |
Roll chromium_revision a12e1e1..0cb2549 (326495:327252)
https://codereview.chromium.org/1051343002 adds a dependency
on Chromium's third_party/junit into base/ which affects our
Android tests that uses that code.
The precompiled JUnit 4.11 JAR file that is only by the
libjingle_peerconnection_java_unittest target on Linux has been
moved to third_party/junit-jar, since it collided with the expected
path for the JUnit dependency mentioned above.
It had to be kept since the Chromium JUnit is only possible to build
when OS==android.
This CL also brings in Mockito and Robolectric, which should be
useful for our Android tests.
Other relevant changes:
* src/buildtools: 3b302fe..15308f4
* src/third_party/libjpeg_turbo: 034e9a9..9e9058b
* src/third_party/libyuv: 32ad6e0..01db3d1
Details: https://chromium.googlesource.com/chromium/src/+/a12e1e1..0cb2549/DEPS
Clang version was not updated in this roll.
BUG=4499
R=phoglund@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/48239004
Cr-Commit-Position: refs/heads/master@{#9113}
Diffstat (limited to 'DEPS')
| -rw-r--r-- | DEPS | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -6,7 +6,7 @@ vars = { 'extra_gyp_flag': '-Dextra_gyp_flag=0', 'chromium_git': 'https://chromium.googlesource.com', - 'chromium_revision': 'a12e1e10c4a910a4f8aa20e3ea8b611846f19ed9', + 'chromium_revision': '0cb254911980cce90b2e5c7207a37a27420e9ea7', } # NOTE: Prefer revision numbers to tags for svn deps. Use http rather than @@ -17,7 +17,7 @@ deps = { 'src/third_party/gflags/src': Var('chromium_git') + '/external/gflags/src@e7390f9185c75f8d902c05ed7d20bb94eb914d0c', # from svn revision 82 - 'src/third_party/junit': + 'src/third_party/junit-jar': Var('chromium_git') + '/external/webrtc/deps/third_party/junit@f35596b476aa6e62fd3b3857b9942ddcd13ce35e', # from svn revision 3367 } |