Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(98)

Side by Side Diff: webrtc/supplement.gypi

Issue 1741663002: Roll chromium_revision 7542f07..38664e7 (377632:377790) + set SDK 10.11 on Mac (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Added min SDK 10.11 Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « build_overrides/build.gni ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 { 1 {
2 'variables': { 2 'variables': {
3 'variables': { 3 'variables': {
4 'webrtc_root%': '<(DEPTH)/webrtc', 4 'webrtc_root%': '<(DEPTH)/webrtc',
5 # Override the default (10.6) in Chromium's build/common.gypi. 5 # Override the defaults in Chromium's build/common.gypi.
6 # Needed for ARC and libc++. 6 # Needed for ARC and libc++.
7 'mac_sdk_min%': '10.11',
7 'mac_deployment_target%': '10.7', 8 'mac_deployment_target%': '10.7',
8 }, 9 },
9 'webrtc_root%': '<(webrtc_root)', 10 'webrtc_root%': '<(webrtc_root)',
10 'mac_deployment_target%': '<(mac_deployment_target)', 11 'mac_deployment_target%': '<(mac_deployment_target)',
11 'use_sysroot%': '<(use_sysroot)', 12 'use_sysroot%': '<(use_sysroot)',
12 'build_with_chromium': 0, 13 'build_with_chromium': 0,
13 'conditions': [ 14 'conditions': [
14 ['OS=="ios"', { 15 ['OS=="ios"', {
15 # Default to using BoringSSL on iOS. 16 # Default to using BoringSSL on iOS.
16 'use_openssl%': 1, 17 'use_openssl%': 1,
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 ], 49 ],
49 'sources': [ 50 'sources': [
50 '<(webrtc_root)/build/sanitizers/tsan_suppressions_webrtc.cc', 51 '<(webrtc_root)/build/sanitizers/tsan_suppressions_webrtc.cc',
51 ], 52 ],
52 }], 53 }],
53 ], 54 ],
54 }], 55 }],
55 ], 56 ],
56 }, 57 },
57 } 58 }
OLDNEW
« no previous file with comments | « build_overrides/build.gni ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698