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

Side by Side Diff: webrtc/supplement.gypi

Issue 1713493002: Roll chromium_revision 1d144ca..fa5d546 (375480:376142) (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: A collection of fixes 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 | « webrtc/modules/audio_processing/audio_processing_tests.gypi ('k') | webrtc/test/test.gyp » ('j') | 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,
12 }, 8 },
13 'webrtc_root%': '<(webrtc_root)', 9 'webrtc_root%': '<(webrtc_root)',
14 'mac_deployment_target%': '<(mac_deployment_target)', 10 'mac_deployment_target%': '<(mac_deployment_target)',
15 'use_sysroot%': '<(use_sysroot)', 11 'use_sysroot%': '<(use_sysroot)',
16 'build_with_chromium': 0, 12 'build_with_chromium': 0,
17 'conditions': [ 13 'conditions': [
18 ['OS=="ios"', { 14 ['OS=="ios"', {
19 # Default to using BoringSSL on iOS. 15 # Default to using BoringSSL on iOS.
20 'use_openssl%': 1, 16 'use_openssl%': 1,
21 17
(...skipping 30 matching lines...) Expand all
52 ], 48 ],
53 'sources': [ 49 'sources': [
54 '<(webrtc_root)/build/sanitizers/tsan_suppressions_webrtc.cc', 50 '<(webrtc_root)/build/sanitizers/tsan_suppressions_webrtc.cc',
55 ], 51 ],
56 }], 52 }],
57 ], 53 ],
58 }], 54 }],
59 ], 55 ],
60 }, 56 },
61 } 57 }
OLDNEW
« no previous file with comments | « webrtc/modules/audio_processing/audio_processing_tests.gypi ('k') | webrtc/test/test.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698