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

Side by Side Diff: webrtc/supplement.gypi

Issue 1644843003: Compile rtc_base_objc and rtc_api_objc for Mac (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Add references to issues Created 4 years, 10 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, 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/01 06:08:29 I don't like adding these variables just for compa
kjellander_webrtc 2016/02/01 06:20:19 I found at least one greather than string comparis
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
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 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698