a9e363e721
Mainly to pick up https://codereview.chromium.org/619723006/ to fix our MSan bot. Summary of changes (git diff c264a05..fc668e2 DEPS): * third_party/boringssl 01fe820..c7dd5f30 * third_party/usrsctp/usrsctplib 8975bd5..d5685d4 * tools/swarming_client 79940aee..33d442a Clang updated 216630:217949 (git diff c264a05..fc668e2 tools/clang/scripts/update.sh) This caused TSan v2 to hit an assert in libjingle_peerconnection_unittest and libjingle_media_unittest, which is why the dlclose call had to be disabled for now (webrtc:3895). BUG=3895 R=henrika@webrtc.org, pbos@webrtc.org Review URL: https://webrtc-codereview.appspot.com/28659004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7385 4adac7df-926f-26a2-2b94-8c16560cd09d
90 lines
2.7 KiB
Python
90 lines
2.7 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 = {
|
|
# Override root_dir in your .gclient's custom_vars to specify a custom root
|
|
# folder name.
|
|
"root_dir": "trunk",
|
|
"extra_gyp_flag": "-Dextra_gyp_flag=0",
|
|
|
|
# Use this googlecode_url variable only if there is an internal mirror for it.
|
|
# If you do not know, use the full path while defining your new deps entry.
|
|
"googlecode_url": "http://%s.googlecode.com/svn",
|
|
"chromium_revision": "fc668e2ac96160f88e72a1166f5dbd69ccd13c3a",
|
|
}
|
|
|
|
# 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 deps/third_party/webrtc/webrtc.DEPS/DEPS
|
|
# in Chromium's repo.
|
|
Var("root_dir") + "/third_party/gflags/src":
|
|
(Var("googlecode_url") % "gflags") + "/trunk/src@84",
|
|
|
|
Var("root_dir") + "/third_party/junit/":
|
|
(Var("googlecode_url") % "webrtc") + "/deps/third_party/junit@3367",
|
|
}
|
|
|
|
deps_os = {
|
|
"win": {
|
|
Var("root_dir") + "/third_party/winsdk_samples/src":
|
|
(Var("googlecode_url") % "webrtc") + "/deps/third_party/winsdk_samples_v71@3145",
|
|
},
|
|
}
|
|
|
|
# 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',
|
|
'+net',
|
|
'+talk',
|
|
'+testing',
|
|
'+third_party',
|
|
'+webrtc',
|
|
]
|
|
|
|
# checkdeps.py shouldn't check include paths for files in these dirs:
|
|
skip_child_includes = [
|
|
'webrtc/overrides',
|
|
]
|
|
|
|
hooks = [
|
|
{
|
|
# Clone chromium and its deps.
|
|
"name": "sync chromium",
|
|
"pattern": ".",
|
|
"action": ["python", "-u", Var("root_dir") + "/sync_chromium.py",
|
|
"--target-revision", Var("chromium_revision")],
|
|
},
|
|
{
|
|
# Create links to shared dependencies in Chromium.
|
|
"name": "setup_links",
|
|
"pattern": ".",
|
|
"action": ["python", Var("root_dir") + "/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",
|
|
Var("root_dir") + "/resources"],
|
|
},
|
|
{
|
|
# A change to a .gyp, .gypi, or to GYP itself should run the generator.
|
|
"name": "gyp",
|
|
"pattern": ".",
|
|
"action": ["python", Var("root_dir") + "/webrtc/build/gyp_webrtc",
|
|
Var("extra_gyp_flag")],
|
|
},
|
|
]
|
|
|