From 10cd6ff5d07600cb87dc72361b3b5d91303990d7 Mon Sep 17 00:00:00 2001 From: kjellander Date: Fri, 26 Feb 2016 03:21:14 -0800 Subject: [PATCH] Roll chromium_revision 7542f07..38664e7 (377632:377790) + set SDK 10.11 on Mac Change log: https://chromium.googlesource.com/chromium/src/+log/7542f07..38664e7 Full diff: https://chromium.googlesource.com/chromium/src/+/7542f07..38664e7 Changed dependencies: * src/buildtools: https://chromium.googlesource.com/chromium/buildtools.git/+log/97b5c48..14288a0 * src/tools/swarming_client: https://chromium.googlesource.com/external/swarming.client.git/+log/71c61c8..a72f46e DEPS diff: https://chromium.googlesource.com/chromium/src/+/7542f07..38664e7/DEPS No update to Clang. TBR=tkchin@webrtc.org Review URL: https://codereview.webrtc.org/1741663002 Cr-Commit-Position: refs/heads/master@{#11780} --- DEPS | 2 +- build_overrides/build.gni | 7 ++++--- webrtc/supplement.gypi | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/DEPS b/DEPS index 396455af6c..e495d1a364 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': '7542f07f67d1e614024e6f4f7ef08fe7dfe70a18', + 'chromium_revision': '38664e74cd3692104d105a51567f229341fff964', } # 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 0822c2bde8..caf629d0a1 100644 --- a/build_overrides/build.gni +++ b/build_overrides/build.gni @@ -7,7 +7,8 @@ # 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. +# Some WebRTC targets require the 10.7 deployment version of the Mac SDK and a +# 10.11 min 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_sdk_min_build_override = "10.11" mac_deployment_target_build_override = "10.7" diff --git a/webrtc/supplement.gypi b/webrtc/supplement.gypi index 183255b715..2cd5400f22 100644 --- a/webrtc/supplement.gypi +++ b/webrtc/supplement.gypi @@ -2,8 +2,9 @@ 'variables': { 'variables': { 'webrtc_root%': '<(DEPTH)/webrtc', - # Override the default (10.6) in Chromium's build/common.gypi. + # Override the defaults in Chromium's build/common.gypi. # Needed for ARC and libc++. + 'mac_sdk_min%': '10.11', 'mac_deployment_target%': '10.7', }, 'webrtc_root%': '<(webrtc_root)',