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