OLD | NEW |
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. |
| 6 # Needed for ARC and libc++. |
| 7 'mac_deployment_target%': '10.7', |
5 }, | 8 }, |
6 'webrtc_root%': '<(webrtc_root)', | 9 'webrtc_root%': '<(webrtc_root)', |
| 10 'mac_deployment_target%': '<(mac_deployment_target)', |
7 'build_with_chromium': 0, | 11 'build_with_chromium': 0, |
8 'conditions': [ | 12 'conditions': [ |
9 ['OS=="ios"', { | 13 ['OS=="ios"', { |
10 # Default to using BoringSSL on iOS. | 14 # Default to using BoringSSL on iOS. |
11 'use_openssl%': 1, | 15 'use_openssl%': 1, |
12 | 16 |
13 # Set target_subarch for if not already set. This is needed because the | 17 # Set target_subarch for if not already set. This is needed because the |
14 # Chromium iOS toolchain relies on target_subarch being set. | 18 # Chromium iOS toolchain relies on target_subarch being set. |
15 'conditions': [ | 19 'conditions': [ |
16 ['target_arch=="arm" or target_arch=="ia32"', { | 20 ['target_arch=="arm" or target_arch=="ia32"', { |
(...skipping 26 matching lines...) Expand all Loading... |
43 ], | 47 ], |
44 'sources': [ | 48 'sources': [ |
45 '<(webrtc_root)/build/sanitizers/tsan_suppressions_webrtc.cc', | 49 '<(webrtc_root)/build/sanitizers/tsan_suppressions_webrtc.cc', |
46 ], | 50 ], |
47 }], | 51 }], |
48 ], | 52 ], |
49 }], | 53 }], |
50 ], | 54 ], |
51 }, | 55 }, |
52 } | 56 } |
OLD | NEW |