10ba3eec5a
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: 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}
26 lines
847 B
Python
26 lines
847 B
Python
solutions = [{
|
|
'name': 'src',
|
|
'url': 'https://chromium.googlesource.com/chromium/src.git',
|
|
'deps_file': '.DEPS.git',
|
|
'managed': False,
|
|
'custom_deps': {
|
|
# Skip syncing some large dependencies WebRTC will never need.
|
|
'src/chrome/tools/test/reference_build/chrome_linux': None,
|
|
'src/chrome/tools/test/reference_build/chrome_mac': None,
|
|
'src/chrome/tools/test/reference_build/chrome_win': None,
|
|
'src/native_client': None,
|
|
'src/third_party/cld_2/src': None,
|
|
'src/third_party/ffmpeg': None,
|
|
'src/third_party/hunspell_dictionaries': None,
|
|
'src/third_party/liblouis/src': None,
|
|
'src/third_party/pdfium': None,
|
|
'src/third_party/skia': None,
|
|
'src/third_party/trace-viewer': None,
|
|
'src/third_party/webrtc': None,
|
|
'src/third_party/WebKit': None,
|
|
},
|
|
'safesync_url': ''
|
|
}]
|
|
|
|
cache_dir = None
|