From 0be9df429349d0582380bddf534848b7468da0ff Mon Sep 17 00:00:00 2001 From: Henrik Kjellander Date: Tue, 23 Feb 2016 07:18:43 +0100 Subject: [PATCH] Roll chromium_revision aa04eb9..4d6ba6e (376768:376909) Add build_overrides/build.gni similar to https://codereview.chromium.org/1686373002 in order for us to have some targets generated only for WebRTC. Change log: https://chromium.googlesource.com/chromium/src/+log/aa04eb9..4d6ba6e Full diff: https://chromium.googlesource.com/chromium/src/+/aa04eb9..4d6ba6e Changed dependencies: * src/buildtools: https://chromium.googlesource.com/chromium/buildtools.git/+log/ef3e530..97b5c48 DEPS diff: https://chromium.googlesource.com/chromium/src/+/aa04eb9..4d6ba6e/DEPS No update to Clang. TBR=tkchin@webrtc.org BUG=webrtc:5453 Review URL: https://codereview.webrtc.org/1720353002 . Cr-Commit-Position: refs/heads/master@{#11715} --- DEPS | 2 +- build_overrides/build.gni | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 build_overrides/build.gni diff --git a/DEPS b/DEPS index 0e2cb80bb6..4e2cf56ad0 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': 'aa04eb9feeaea5437ab62a19e5aea3109ae6eea8', + 'chromium_revision': '4d6ba6e034703125e3b1218d499611ef3919feb6', } # 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 new file mode 100644 index 0000000000..0822c2bde8 --- /dev/null +++ b/build_overrides/build.gni @@ -0,0 +1,13 @@ +# Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. +# +# Use of this source code is governed by a BSD-style license +# that can be found in the LICENSE file in the root of the source +# tree. An additional intellectual property rights grant can be found +# in the file PATENTS. All contributing project authors may +# be found in the AUTHORS file in the root of the source tree. + +# See https://bugs.chromium.org/p/webrtc/issues/detail?id=5453. +# Some WebRTC targets require the 10.7 deployment version of the Mac SDK, +# but those targets are only used in non-Chromium builds. We can remove +# this when Chromium drops 10.6 support and also requires 10.7. +mac_deployment_target_build_override = "10.7"