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, libc++, and nullability. |
7 'mac_deployment_target%': '10.7', | 7 'mac_deployment_target%': '10.10', |
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 'mac_deployment_target_major%': 10, | |
kjellander_webrtc
2016/02/03 07:57:33
I give up and to accept these two new variables af
hjon_webrtc
2016/02/04 01:43:03
Done.
| |
16 'mac_deployment_target_minor%': 10, | |
15 'use_sysroot%': '<(use_sysroot)', | 17 'use_sysroot%': '<(use_sysroot)', |
16 'build_with_chromium': 0, | 18 'build_with_chromium': 0, |
17 'conditions': [ | 19 'conditions': [ |
18 ['OS=="ios"', { | 20 ['OS=="ios"', { |
19 # Default to using BoringSSL on iOS. | 21 # Default to using BoringSSL on iOS. |
20 'use_openssl%': 1, | 22 'use_openssl%': 1, |
21 | 23 |
22 # Set target_subarch for if not already set. This is needed because the | 24 # Set target_subarch for if not already set. This is needed because the |
23 # Chromium iOS toolchain relies on target_subarch being set. | 25 # Chromium iOS toolchain relies on target_subarch being set. |
24 'conditions': [ | 26 'conditions': [ |
(...skipping 27 matching lines...) Expand all Loading... | |
52 ], | 54 ], |
53 'sources': [ | 55 'sources': [ |
54 '<(webrtc_root)/build/sanitizers/tsan_suppressions_webrtc.cc', | 56 '<(webrtc_root)/build/sanitizers/tsan_suppressions_webrtc.cc', |
55 ], | 57 ], |
56 }], | 58 }], |
57 ], | 59 ], |
58 }], | 60 }], |
59 ], | 61 ], |
60 }, | 62 }, |
61 } | 63 } |
OLD | NEW |