admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Roll chromium_revision 7542f07..38664e7 (377632:377790) + set SDK 10.11 on Mac

Browse Source 
Change log: 7542f07..38664e7
Full diff: 7542f07..38664e7

Changed dependencies:
* src/buildtools: 97b5c48..14288a0
* src/tools/swarming_client: 71c61c8..a72f46e
DEPS diff: 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}
This commit is contained in:
kjellander 2016-02-26 03:21:14 -08:00 committed by Commit bot
parent 686a8efad9
commit 10cd6ff5d0
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -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

7
build_overrides/build.gni
View File

@ -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"

3
webrtc/supplement.gypi
View File

@ -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)',