From e3897ad7e25aa30cd34034c5dd3f462e04604699 Mon Sep 17 00:00:00 2001 From: kjellander Date: Thu, 28 Apr 2016 02:51:02 -0700 Subject: [PATCH] Roll chromium_revision 2a03e86fcf..bc1c2103ef (389507:390316) The BoringSSL changes in https://codereview.chromium.org/1917223004/ https://codereview.chromium.org/1919383002/ required moving the build_with_chromium variable to build.gni. Change log: https://chromium.googlesource.com/chromium/src/+log/2a03e86fcf..bc1c2103ef Full diff: https://chromium.googlesource.com/chromium/src/+/2a03e86fcf..bc1c2103ef Changed dependencies: * src/buildtools: https://chromium.googlesource.com/chromium/buildtools.git/+log/e84114dbe2..cdbd50759b * src/third_party/boringssl/src: https://boringssl.googlesource.com/boringssl.git/+log/f01fb5dc0e..a081423809 * src/tools/gyp: https://chromium.googlesource.com/external/gyp.git/+log/6ea68631cd..4cf07e8d61 DEPS diff: https://chromium.googlesource.com/chromium/src/+/2a03e86fcf..bc1c2103ef/DEPS Clang version changed 266460:267383 Details: https://chromium.googlesource.com/chromium/src/+/2a03e86fcf..bc1c2103ef/tools/clang/scripts/update.py TBR=pbos@webrtc.org NOTRY=True Review-Url: https://codereview.webrtc.org/1925843003 Cr-Commit-Position: refs/heads/master@{#12544} --- DEPS | 2 +- build_overrides/build.gni | 4 ++++ build_overrides/webrtc.gni | 4 +++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index 1707c3c35e..a51c0c7f87 100644 --- a/DEPS +++ b/DEPS @@ -6,7 +6,7 @@ vars = { 'extra_gyp_flag': '-Dextra_gyp_flag=0', 'chromium_git': 'https://chromium.googlesource.com', - 'chromium_revision': '2a03e86fcfb6f831ef8658cbd360f54bb5ace62e', + 'chromium_revision': 'bc1c2103ef7da6c61df91d2ee7dc1b00098a2b57', } # NOTE: Use http rather than https; the latter can cause problems for users diff --git a/build_overrides/build.gni b/build_overrides/build.gni index caf629d0a1..1088355ef7 100644 --- a/build_overrides/build.gni +++ b/build_overrides/build.gni @@ -12,3 +12,7 @@ # remove this when Chromium drops 10.6 support and also requires 10.7. mac_sdk_min_build_override = "10.11" mac_deployment_target_build_override = "10.7" + +# Variable that can be used to support multiple build scenarios, like having +# Chromium specific targets in a client project's GN file etc. +build_with_chromium = false diff --git a/build_overrides/webrtc.gni b/build_overrides/webrtc.gni index 0869397bef..a9bbdbf95b 100644 --- a/build_overrides/webrtc.gni +++ b/build_overrides/webrtc.gni @@ -12,7 +12,9 @@ # Every variable here needs to be present in the corresponding file in # build_overrides/ of Chromium. -build_with_chromium = false +# The build_with_chromium variable is now located in build.gni (now also used +# by BoringSSL). +import("//build_overrides/build.gni") # Excluded in Chromium since its prerequisites don't require Pulse Audio. rtc_include_pulse_audio = true