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

Side by Side Diff: webrtc/supplement.gypi

Issue 1578953003: Add a gyp/gn variable for whether to use iLBC or not (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 11 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
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, 8 # Disable use of sysroot for Linux. It's enabled by default in Chromium,
9 # but it currently lacks the libudev-dev package. 9 # but it currently lacks the libudev-dev package.
10 # TODO(kjellander): Remove when crbug.com/561584 is fixed. 10 # TODO(kjellander): Remove when crbug.com/561584 is fixed.
11 'use_sysroot': 0, 11 'use_sysroot': 0,
12 }, 12 },
13 'webrtc_root%': '<(webrtc_root)', 13 'webrtc_root%': '<(webrtc_root)',
14 'mac_deployment_target%': '<(mac_deployment_target)', 14 'mac_deployment_target%': '<(mac_deployment_target)',
15 'use_sysroot%': '<(use_sysroot)', 15 'use_sysroot%': '<(use_sysroot)',
16 'build_with_chromium': 0, 16 'build_with_chromium': 0,
17
18 # iLBC isn't included by default, but in standalone WebRTC we want it
19 # for testing.
20 'include_ilbc': 1,
kjellander_webrtc 2016/01/12 16:23:27 ah, I missed this. Please make this (note the %):
kwiberg-webrtc 2016/01/14 10:59:31 This typo cost me at least half an hour. I couldn'
21
17 'conditions': [ 22 'conditions': [
18 ['OS=="ios"', { 23 ['OS=="ios"', {
19 # Default to using BoringSSL on iOS. 24 # Default to using BoringSSL on iOS.
20 'use_openssl%': 1, 25 'use_openssl%': 1,
21 26
22 # Set target_subarch for if not already set. This is needed because the 27 # Set target_subarch for if not already set. This is needed because the
23 # Chromium iOS toolchain relies on target_subarch being set. 28 # Chromium iOS toolchain relies on target_subarch being set.
24 'conditions': [ 29 'conditions': [
25 ['target_arch=="arm" or target_arch=="ia32"', { 30 ['target_arch=="arm" or target_arch=="ia32"', {
26 'target_subarch%': 'arm32', 31 'target_subarch%': 'arm32',
(...skipping 25 matching lines...) Expand all
52 ], 57 ],
53 'sources': [ 58 'sources': [
54 '<(webrtc_root)/build/sanitizers/tsan_suppressions_webrtc.cc', 59 '<(webrtc_root)/build/sanitizers/tsan_suppressions_webrtc.cc',
55 ], 60 ],
56 }], 61 }],
57 ], 62 ],
58 }], 63 }],
59 ], 64 ],
60 }, 65 },
61 } 66 }
OLDNEW
« webrtc/build/common.gypi ('K') | « webrtc/modules/audio_coding/neteq/neteq.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698