b17bfa996d
Reason for revert: Didn't solve the upstream breakage. Original issue's description: > Revert of Roll chromium_revision 54c8d0a5e2..39c812dd97 (403836:404030) (patchset #1 id:1 of https://codereview.webrtc.org/2123373003/ ) > > Reason for revert: > Might have broken upstream projects. Will reland if not. > > Original issue's description: > > Roll chromium_revision 54c8d0a5e2..39c812dd97 (403836:404030) > > > > Change log:54c8d0a5e2..39c812dd97> > Full diff:54c8d0a5e2..39c812dd97> > > > Changed dependencies: > > * src/buildtools:d2664782a3..aa47d9773d> > * src/tools/gyp:c61b0b35c8..bac4680ec9> > DEPS diff:54c8d0a5e2..39c812dd97/DEPS > > > > No update to Clang. > > > > TBR= > > > > Committed: https://crrev.com/e7e6a07f7301b0262025113a4e08eba4cb338ad8 > > Cr-Commit-Position: refs/heads/master@{#13401} > > TBR=buildbot@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > > Committed: https://crrev.com/cf47f0bd637690ee7170ef5dbf3765a858eb1c52 > Cr-Commit-Position: refs/heads/master@{#13405} TBR=buildbot@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review-Url: https://codereview.webrtc.org/2125283002 Cr-Commit-Position: refs/heads/master@{#13406}
95 lines
3.1 KiB
Python
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': '39c812dd971e69397daec3d9ba31136c9d4c845d',
|
|
}
|
|
|
|
# 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')],
|
|
},
|
|
]
|
|
|