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. | 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 Loading... |
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 } |
OLD | NEW |