14665ff7d4
Clang version changed 223108:230914
Details: e144d30..6fdb142/tools/clang/scripts/update.sh
Removes the OVERRIDE macro defined in:
* webrtc/base/common.h
* webrtc/typedefs.h
The majority of the source changes were done by running this in src/:
perl -0pi -e "s/virtual\s([^({;]*(\([^({;]*\)[^({;]*))(OVERRIDE|override)/\1override/sg" `find {talk,webrtc} -name "*.h" -o -name "*.cc*" -o -name "*.mm*"`
which converted all:
virtual Foo() OVERRIDE
functions to:
Foo() override
Then I manually edited:
* talk/media/webrtc/fakewebrtccommon.h
* webrtc/test/fake_common.h
Remaining uses of OVERRIDE was fixed by search+replace.
Manual edits were done to fix virtual destructors that were
overriding inherited ones.
Finally a build error related to the pure virtual definitions of
Read, Write and Rewind in common_types.h required a bit of
refactoring in:
* webrtc/common_types.cc
* webrtc/common_types.h
* webrtc/system_wrappers/interface/file_wrapper.h
* webrtc/system_wrappers/source/file_impl.cc
This roll should make it possible for us to finally re-enable deadlock
detection for TSan on the buildbots.
BUG=4106
R=pbos@webrtc.org, tommi@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/41069004
Cr-Commit-Position: refs/heads/master@{#8596}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8596 4adac7df-926f-26a2-2b94-8c16560cd09d
95 lines
2.9 KiB
Python
95 lines
2.9 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': '6fdb1425edf17f7b3d55626927d4fddb076a8e31',
|
|
}
|
|
|
|
# NOTE: Prefer revision numbers to tags for svn deps. Use http rather than
|
|
# https; the latter can cause problems for users behind proxies.
|
|
deps = {
|
|
# When rolling gflags, also update
|
|
# https://chromium.googlesource.com/chromium/deps/webrtc/webrtc.DEPS
|
|
'src/third_party/gflags/src':
|
|
Var('chromium_git') + '/external/gflags/src@e7390f9185c75f8d902c05ed7d20bb94eb914d0c', # from svn revision 82
|
|
|
|
'src/third_party/junit':
|
|
Var('chromium_git') + '/external/webrtc/deps/third_party/junit@f35596b476aa6e62fd3b3857b9942ddcd13ce35e', # from svn revision 3367
|
|
}
|
|
|
|
deps_os = {
|
|
'win': {
|
|
'src/third_party/winsdk_samples/src':
|
|
Var('chromium_git') + '/external/webrtc/deps/third_party/winsdk_samples_v71@c0cbedd854cb610a53226d9817416c4ab9a7d1e9', # from svn revision 7951
|
|
},
|
|
}
|
|
|
|
# Define rules for which include paths are allowed in our source.
|
|
include_rules = [
|
|
# Base is only used to build Android APK tests and may not be referenced by
|
|
# WebRTC production code.
|
|
'-base',
|
|
'-chromium',
|
|
'+gflags',
|
|
'+libyuv',
|
|
'+net',
|
|
'+talk',
|
|
'+testing',
|
|
'+third_party',
|
|
'+webrtc',
|
|
]
|
|
|
|
# checkdeps.py shouldn't check include paths for files in these dirs:
|
|
skip_child_includes = [
|
|
'webrtc/overrides',
|
|
]
|
|
|
|
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'],
|
|
},
|
|
{
|
|
# 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',
|
|
'--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',
|
|
Var('extra_gyp_flag')],
|
|
},
|
|
]
|
|
|