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

Side by Side Diff: webrtc/supplement.gypi

Issue 1884233002: Remove use_openssl from webrtc (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 8 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/media/media.gyp ('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 defaults 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_sdk_min%': '10.11',
8 'mac_deployment_target%': '10.7', 8 'mac_deployment_target%': '10.7',
9 }, 9 },
10 'webrtc_root%': '<(webrtc_root)', 10 'webrtc_root%': '<(webrtc_root)',
11 'mac_deployment_target%': '<(mac_deployment_target)', 11 'mac_deployment_target%': '<(mac_deployment_target)',
12 'use_sysroot%': '<(use_sysroot)', 12 'use_sysroot%': '<(use_sysroot)',
13 'build_with_chromium': 0, 13 'build_with_chromium': 0,
14 'conditions': [ 14 'conditions': [
15 ['OS=="ios"', { 15 ['OS=="ios"', {
16 # Default to using BoringSSL on iOS.
17 'use_openssl%': 1,
18
19 # Set target_subarch for if not already set. This is needed because the 16 # Set target_subarch for if not already set. This is needed because the
20 # Chromium iOS toolchain relies on target_subarch being set. 17 # Chromium iOS toolchain relies on target_subarch being set.
21 'conditions': [ 18 'conditions': [
22 ['target_arch=="arm" or target_arch=="ia32"', { 19 ['target_arch=="arm" or target_arch=="ia32"', {
23 'target_subarch%': 'arm32', 20 'target_subarch%': 'arm32',
24 }], 21 }],
25 ['target_arch=="arm64" or target_arch=="x64"', { 22 ['target_arch=="arm64" or target_arch=="x64"', {
26 'target_subarch%': 'arm64', 23 'target_subarch%': 'arm64',
27 }], 24 }],
28 ], 25 ],
(...skipping 20 matching lines...) Expand all
49 ], 46 ],
50 'sources': [ 47 'sources': [
51 '<(webrtc_root)/build/sanitizers/tsan_suppressions_webrtc.cc', 48 '<(webrtc_root)/build/sanitizers/tsan_suppressions_webrtc.cc',
52 ], 49 ],
53 }], 50 }],
54 ], 51 ],
55 }], 52 }],
56 ], 53 ],
57 }, 54 },
58 } 55 }
OLDNEW
« no previous file with comments | « webrtc/media/media.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698