Roll chromium_revision e3860bd297..938114be1e (412289:414059)

Change log: e3860bd297..938114be1e
Full diff: e3860bd297..938114be1e

Changed dependencies:
* src/third_party/boringssl/src: https://boringssl.googlesource.com/boringssl.git/+log/96e1a25943..405da48900
* src/third_party/libvpx/source/libvpx: 2d1e63d0c5..f5bd76f5c1
DEPS diff: e3860bd297..938114be1e/DEPS

Clang version changed 277962:278861
Details: e3860bd297..938114be1e/tools/clang/scripts/update.py

TBR=marpan@webrtc.org
BUG=webrtc:6245
NOTRY=True

Review-Url: https://codereview.webrtc.org/2269953002
Cr-Commit-Position: refs/heads/master@{#13899}
This commit is contained in:
ehmaldonado
2016-08-24 08:16:21 -07:00
committed by Commit bot
parent 28a0ffdd52
commit b0b0edb8af
2 changed files with 6 additions and 11 deletions

2
DEPS
View File

@ -6,7 +6,7 @@
vars = {
'extra_gyp_flag': '-Dextra_gyp_flag=0',
'chromium_git': 'https://chromium.googlesource.com',
'chromium_revision': 'e3860bd297e465778059f3d845280634b4074e19',
'chromium_revision': '938114be1ecffa98a68ededc466b85ab6b16dcd8',
}
# NOTE: Use http rather than https; the latter can cause problems for users

View File

@ -94,21 +94,16 @@
'action': [
'python',
'<(protoc_wrapper)',
'--include',
'<(cc_include)',
'--protobuf',
'<(cc_dir)/<(RULE_INPUT_ROOT).pb.h',
'--protoc',
'<(protoc)',
# Using the --arg val form (instead of --arg=val) allows gyp's msvs rule
# generation to correct 'val' which is a path.
'--proto-in-dir','<(proto_in_dir)',
# Naively you'd use <(RULE_INPUT_PATH) here, but protoc requires
# --proto_path is a strict prefix of the path given as an argument.
'--proto-in-file','<(RULE_INPUT_ROOT)<(RULE_INPUT_EXT)',
'--use-system-protobuf=<(use_system_protobuf)',
'--',
'<(protoc)',
'--cpp_out', '<(cc_generator_options)<(cc_dir)',
'--python_out', '<(py_dir)',
'--cc-out-dir', '<(cc_generator_options)<(cc_dir)',
'--py-out-dir', '<(py_dir)',
'<(RULE_INPUT_ROOT)<(RULE_INPUT_EXT)',
],
'message': 'Generating C++ and Python code from <(RULE_INPUT_PATH)',
'process_outputs_as_sources': 1,