Skip to content

Commit

Permalink
Roll chromium_revision e9fcce491e..ffaf1e2ba6 (565609:565764)
Browse files Browse the repository at this point in the history
Change log: https://chromium.googlesource.com/chromium/src/+log/e9fcce491e..ffaf1e2ba6
Full diff: https://chromium.googlesource.com/chromium/src/+/e9fcce491e..ffaf1e2ba6

Roll chromium third_party b1a95b2d51..fb3dc2a0aa
Change log: https://chromium.googlesource.com/chromium/src/third_party/+log/b1a95b2d51..fb3dc2a0aa

Changed dependencies:
* src/base: https://chromium.googlesource.com/chromium/src/base/+log/6d59c6b0f4..2743076235
* src/build: https://chromium.googlesource.com/chromium/src/build/+log/472d5df73f..459adce3eb
* src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/2c466eefd8..71b35d6ee6
* src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/4162fb6122..f624b1f4b7
* src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/c9718952e5..eca23c365a
* src/third_party/depot_tools: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/8e6f58c7e6..e05f18d477
* src/third_party/libFuzzer/src: https://chromium.googlesource.com/chromium/llvm-project/compiler-rt/lib/fuzzer.git/+log/fda403cf93..873dc11d9a
* src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/1702b5a977..76e5757c8f
DEPS diff: https://chromium.googlesource.com/chromium/src/+/e9fcce491e..ffaf1e2ba6/DEPS

No update to Clang.

[email protected],
BUG=None
CQ_INCLUDE_TRYBOTS=master.internal.tryserver.corp.webrtc:linux_internal
NO_AUTOIMPORT_DEPS_CHECK=true

Change-Id: Ib9d3e2073829e4386d23970dda3f50f5bf2ee4da
Reviewed-on: https://webrtc-review.googlesource.com/82380
Commit-Queue: WebRTC Buildbot <[email protected]>
Reviewed-by: WebRTC Buildbot <[email protected]>
Cr-Commit-Position: refs/heads/master@{#23557}
  • Loading branch information
Autoroller authored and Commit Bot committed Jun 8, 2018
1 parent 1ef88ae commit b7beba4
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 11 deletions.
20 changes: 10 additions & 10 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ vars = {
'checkout_configuration': 'default',
'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"',
'webrtc_git': 'https://webrtc.googlesource.com',
'chromium_revision': 'e9fcce491e0fd41f86b1a27583af87bc91586684',
'chromium_revision': 'ffaf1e2ba66b521c4afe3af865a3f044ae1bff00',
'boringssl_git': 'https://boringssl.googlesource.com',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling swarming_client
Expand All @@ -27,11 +27,11 @@ vars = {
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling catapult
# and whatever else without interference from each other.
'catapult_revision': 'c9718952e5d02e7003820e47503e9f9335f4a8c4',
'catapult_revision': 'eca23c365a07863178be2918fb2c97b23fa97381',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling libFuzzer
# and whatever else without interference from each other.
'libfuzzer_revision': 'fda403cf93ecb8792cb1d061564d89a6553ca020',
'libfuzzer_revision': '873dc11d9a5281034e2cb74d0e87e9149a0e1045',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling freetype
# and whatever else without interference from each other.
Expand All @@ -43,15 +43,15 @@ vars = {
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling Chromium third_party
# and whatever else without interference from each other.
'chromium_third_party_revision': 'b1a95b2d516bf6901166914428fdabb3738dec07',
'chromium_third_party_revision': 'fb3dc2a0aa643c64ee5ee4c3ba13ed40443b68b7',
}
deps = {
# TODO(kjellander): Move this to be Android-only once the libevent dependency
# in base/third_party/libevent is solved.
'src/base':
Var('chromium_git') + '/chromium/src/base' + '@' + '6d59c6b0f4428e325816828499efa8faf81e94a5',
Var('chromium_git') + '/chromium/src/base' + '@' + '27430762358b568f216d88d8af9dd83c1bddcd79',
'src/build':
Var('chromium_git') + '/chromium/src/build' + '@' + '472d5df73fb1e61ffcbed46d0d5a769bb1e05878',
Var('chromium_git') + '/chromium/src/build' + '@' + '459adce3ebfbc114c2d637ebd44c886eac58d441',
'src/buildtools':
Var('chromium_git') + '/chromium/buildtools.git' + '@' + '6f4dae280c6a542acacd8db281decc5c0b2a9823',
# Gradle 4.3-rc4. Used for testing Android Studio project generation for WebRTC.
Expand All @@ -61,11 +61,11 @@ deps = {
'condition': 'checkout_android',
},
'src/ios': {
'url': Var('chromium_git') + '/chromium/src/ios' + '@' + '2c466eefd87b0d19a9d899bb23750fcc04348fe2',
'url': Var('chromium_git') + '/chromium/src/ios' + '@' + '71b35d6ee6df3985bb870990daa8851f60ce4d2e',
'condition': 'checkout_ios',
},
'src/testing':
Var('chromium_git') + '/chromium/src/testing' + '@' + '4162fb612216cb8bb42cfb0639598759986abeaa',
Var('chromium_git') + '/chromium/src/testing' + '@' + 'f624b1f4b7e728d3816e5fcf7f51f98e6f7e7f54',
# This entry is used for chromium third_party rolling into webrtc third_party only.
'src/third_party_chromium': {
'url': Var('chromium_git') + '/chromium/src/third_party' + '@' + Var('chromium_third_party_revision'),
Expand Down Expand Up @@ -94,7 +94,7 @@ deps = {
'src/third_party/colorama/src':
Var('chromium_git') + '/external/colorama.git' + '@' + '799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8',
'src/third_party/depot_tools':
Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '8e6f58c7e6150115b7885ba69c45bffb70fca9c3',
Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + 'e05f18d47735f3bc3f5808d0ce38a452b82d95e8',
'src/third_party/errorprone/lib': {
'url': Var('chromium_git') + '/chromium/third_party/errorprone.git' + '@' + '980d49e839aa4984015efed34b0134d4b2c9b6d7',
'condition': 'checkout_android',
Expand Down Expand Up @@ -185,7 +185,7 @@ deps = {
'src/third_party/yasm/source/patched-yasm':
Var('chromium_git') + '/chromium/deps/yasm/patched-yasm.git' + '@' + 'b98114e18d8b9b84586b10d24353ab8616d4c5fc',
'src/tools':
Var('chromium_git') + '/chromium/src/tools' + '@' + '1702b5a977629f93d4478e6441ba407dc4abd5dd',
Var('chromium_git') + '/chromium/src/tools' + '@' + '76e5757c8fdee7192701a19b6a807a5d9b5c8fc4',
'src/tools/gyp':
Var('chromium_git') + '/external/gyp.git' + '@' + 'd61a9397e668fa9843c4aa7da9e79460fe590bfb',
'src/tools/swarming_client':
Expand Down
4 changes: 3 additions & 1 deletion third_party/libFuzzer/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ fuzzing_engine_add_configs =

source_set("libfuzzer") {
sources = [
"src/FuzzerClangCounters.cpp",
"src/FuzzerCrossOver.cpp",
"src/FuzzerDataFlowTrace.cpp",
"src/FuzzerDriver.cpp",
"src/FuzzerExtFunctionsDlsym.cpp",
"src/FuzzerExtFunctionsDlsymWin.cpp",
Expand All @@ -29,11 +29,13 @@ source_set("libfuzzer") {
"src/FuzzerMerge.cpp",
"src/FuzzerMutate.cpp",
"src/FuzzerSHA1.cpp",
"src/FuzzerShmemFuchsia.cpp",
"src/FuzzerShmemPosix.cpp",
"src/FuzzerShmemWindows.cpp",
"src/FuzzerTracePC.cpp",
"src/FuzzerUtil.cpp",
"src/FuzzerUtilDarwin.cpp",
"src/FuzzerUtilFuchsia.cpp",
"src/FuzzerUtilLinux.cpp",
"src/FuzzerUtilPosix.cpp",
"src/FuzzerUtilWindows.cpp",
Expand Down

0 comments on commit b7beba4

Please sign in to comment.