kjellander b419d6e965 Roll chromium_revision 48e079d573..33f87688e4 (407510:409700)
Added symlink to third_party/closure_compiler to resolve Android GN error.

Change log: 48e079d573..33f87688e4
Full diff: 48e079d573..33f87688e4

Changed dependencies:
* src/buildtools: 60f7f9a8b4..88c6fc5bde
* src/third_party/boringssl/src: https://boringssl.googlesource.com/boringssl.git/+log/5440fe0cd1..0d1b0961f9
* src/third_party/ffmpeg: 24ea727552..4e878f7f64
* src/third_party/libsrtp: 720780acf8..48bdd208dc
* src/third_party/libvpx/source/libvpx: 4b073bc39a..82070ae939
* src/third_party/libyuv: e84dcb43bd..68786ccd53
* src/third_party/lss: 4fc942258f..3f6478ac95
* src/third_party/opus/src: 655cc54c56..aa32042a50
* src/third_party/usrsctp/usrsctplib: c60ec8b35c..9a3e5465e9
* src/tools/swarming_client: 7f63a272f7..e4288c3040
DEPS diff: 48e079d573..33f87688e4/DEPS

No update to Clang.

Skipping trybots since they already ran for https://codereview.webrtc.org/2210493004/ and this CL just adds a
fix for Android GN (which trybots were run).

TBR=marpan@webrtc.org,
BUG=webrtc:6169
NOTRY=True

Review-Url: https://codereview.webrtc.org/2215633002
Cr-Commit-Position: refs/heads/master@{#13632}
2016-08-04 07:00:47 +00:00

95 lines
3.1 KiB
Python

# This file contains dependencies for WebRTC that are not shared with Chromium.
# If you wish to add a dependency that is present in Chromium's src/DEPS or a
# directory from the Chromium checkout, you should add it to setup_links.py
# instead.
vars = {
'extra_gyp_flag': '-Dextra_gyp_flag=0',
'chromium_git': 'https://chromium.googlesource.com',
'chromium_revision': '33f87688e4d164cf8f2ada5b4d01a04468807a11',
}
# NOTE: Use http rather than https; the latter can cause problems for users
# behind proxies.
deps = {
'src/third_party/gflags/src':
Var('chromium_git') + '/external/github.com/gflags/gflags@03bebcb065c83beff83d50ae025a55a4bf94dfca',
}
deps_os = {
'win': {
'src/third_party/winsdk_samples/src':
Var('chromium_git') + '/external/webrtc/deps/third_party/winsdk_samples_v71@e71b549167a665d7424d6f1dadfbff4b4aad1589',
},
}
hooks = [
{
# Check for legacy named top-level dir (named 'trunk').
'name': 'check_root_dir_name',
'pattern': '.',
'action': ['python','-c',
('import os,sys;'
'script = os.path.join("trunk","check_root_dir.py");'
'_ = os.system("%s %s" % (sys.executable,script)) '
'if os.path.exists(script) else 0')],
},
{
# Clone chromium and its deps.
'name': 'sync chromium',
'pattern': '.',
'action': ['python', '-u', 'src/sync_chromium.py',
'--target-revision', Var('chromium_revision')],
},
{
# Create links to shared dependencies in Chromium.
'name': 'setup_links',
'pattern': '.',
'action': ['python', 'src/setup_links.py'],
},
{
# This clobbers when necessary (based on get_landmines.py). It should be
# an early hook but it will need to be run after syncing Chromium and
# setting up the links, so the script actually exists.
'name': 'landmines',
'pattern': '.',
'action': [
'python',
'src/build/landmines.py',
'--landmine-scripts',
'src/webrtc/build/get_landmines.py',
'--src-dir',
'src',
],
},
{
# Pull sanitizer-instrumented third-party libraries if requested via
# GYP_DEFINES. This could be done as part of sync_chromium.py above
# but then we would need to run all the Chromium hooks each time,
# which will slow things down a lot.
'name': 'instrumented_libraries',
'pattern': '\\.sha1',
'action': ['python', 'src/third_party/instrumented_libraries/scripts/download_binaries.py'],
},
{
# Download test resources, i.e. video and audio files from Google Storage.
'pattern': '.',
'action': ['download_from_google_storage',
'--directory',
'--recursive',
'--num_threads=10',
'--no_auth',
'--quiet',
'--bucket', 'chromium-webrtc-resources',
'src/resources'],
},
{
# A change to a .gyp, .gypi, or to GYP itself should run the generator.
'name': 'gyp',
'pattern': '.',
'action': ['python', 'src/webrtc/build/gyp_webrtc.py',
Var('extra_gyp_flag')],
},
]