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 /setup_links.py | |
| 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 'setup_links.py')
| -rwxr-xr-x | setup_links.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/setup_links.py b/setup_links.py index ed8b923db1..64366c1805 100755 --- a/setup_links.py +++ b/setup_links.py @@ -83,10 +83,13 @@ if 'android' in get_target_os_list(): 'third_party/appurify-python', 'third_party/ashmem', 'third_party/jsr-305', + 'third_party/junit', 'third_party/libevent', 'third_party/libxml', + 'third_party/mockito', 'third_party/modp_b64', 'third_party/requests', + 'third_party/robolectric', 'tools/android', 'tools/grit', 'tools/relocation_packer' |