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

Side by Side Diff: webrtc/supplement.gypi

Issue 1468313006: Roll chromium_revision 68cf0b8..aa8e58a (361406:361601) (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Set use_sysroot=0 until crbug.com/561584 is fixed Created 5 years 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 | « DEPS ('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 default (10.6) in Chromium's build/common.gypi.
6 # Needed for ARC and libc++. 6 # Needed for ARC and libc++.
7 'mac_deployment_target%': '10.7', 7 'mac_deployment_target%': '10.7',
8 # Disable use of sysroot for Linux. It's enabled by default in Chromium,
9 # but it currently lacks the libudev-dev package.
10 # TODO(kjellander): Remove when crbug.com/561584 is fixed.
11 'use_sysroot': 0,
8 }, 12 },
9 'webrtc_root%': '<(webrtc_root)', 13 'webrtc_root%': '<(webrtc_root)',
10 'mac_deployment_target%': '<(mac_deployment_target)', 14 'mac_deployment_target%': '<(mac_deployment_target)',
15 'use_sysroot%': '<(use_sysroot)',
11 'build_with_chromium': 0, 16 'build_with_chromium': 0,
12 'conditions': [ 17 'conditions': [
13 ['OS=="ios"', { 18 ['OS=="ios"', {
14 # Default to using BoringSSL on iOS. 19 # Default to using BoringSSL on iOS.
15 'use_openssl%': 1, 20 'use_openssl%': 1,
16 21
17 # Set target_subarch for if not already set. This is needed because the 22 # Set target_subarch for if not already set. This is needed because the
18 # Chromium iOS toolchain relies on target_subarch being set. 23 # Chromium iOS toolchain relies on target_subarch being set.
19 'conditions': [ 24 'conditions': [
20 ['target_arch=="arm" or target_arch=="ia32"', { 25 ['target_arch=="arm" or target_arch=="ia32"', {
(...skipping 26 matching lines...) Expand all
47 ], 52 ],
48 'sources': [ 53 'sources': [
49 '<(webrtc_root)/build/sanitizers/tsan_suppressions_webrtc.cc', 54 '<(webrtc_root)/build/sanitizers/tsan_suppressions_webrtc.cc',
50 ], 55 ],
51 }], 56 }],
52 ], 57 ],
53 }], 58 }],
54 ], 59 ],
55 }, 60 },
56 } 61 }
OLDNEW
« no previous file with comments | « DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698