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

Side by Side Diff: webrtc/api/api.gyp

Issue 1517253005: Update API for Objective-C RTCIceCandidate. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@updateRTCIceServer
Patch Set: Remove copy Created 4 years, 11 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 # Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license 3 # Use of this source code is governed by a BSD-style license
4 # that can be found in the LICENSE file in the root of the source 4 # that can be found in the LICENSE file in the root of the source
5 # tree. An additional intellectual property rights grant can be found 5 # tree. An additional intellectual property rights grant can be found
6 # in the file PATENTS. All contributing project authors may 6 # in the file PATENTS. All contributing project authors may
7 # be found in the AUTHORS file in the root of the source tree. 7 # be found in the AUTHORS file in the root of the source tree.
8 8
9 { 9 {
10 'includes': [ '../build/common.gypi', ], 10 'includes': [ '../build/common.gypi', ],
11 'conditions': [ 11 'conditions': [
12 ['OS=="ios"', { 12 ['OS=="ios"', {
13 'targets': [ 13 'targets': [
14 { 14 {
15 'target_name': 'rtc_api_objc', 15 'target_name': 'rtc_api_objc',
16 'type': 'static_library', 16 'type': 'static_library',
17 'dependencies': [ 17 'dependencies': [
18 '<(webrtc_root)/base/base.gyp:rtc_base_objc', 18 '<(webrtc_root)/base/base.gyp:rtc_base_objc',
19 '../../talk/libjingle.gyp:libjingle_peerconnection',
nicholss 2016/02/05 21:46:00 Hello, this addition is failing on iOS builds in c
19 ], 20 ],
20 'sources': [ 21 'sources': [
22 'objc/RTCIceCandidate+Private.h',
23 'objc/RTCIceCandidate.h',
24 'objc/RTCIceCandidate.mm',
21 'objc/RTCIceServer+Private.h', 25 'objc/RTCIceServer+Private.h',
22 'objc/RTCIceServer.h', 26 'objc/RTCIceServer.h',
23 'objc/RTCIceServer.mm', 27 'objc/RTCIceServer.mm',
24 ], 28 ],
25 'xcode_settings': { 29 'xcode_settings': {
26 'CLANG_ENABLE_OBJC_ARC': 'YES', 30 'CLANG_ENABLE_OBJC_ARC': 'YES',
27 'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'YES', 31 'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'YES',
28 'GCC_PREFIX_HEADER': 'objc/WebRTC-Prefix.pch', 32 'GCC_PREFIX_HEADER': 'objc/WebRTC-Prefix.pch',
29 }, 33 },
30 } 34 }
31 ], 35 ],
32 }], # OS=="ios" 36 }], # OS=="ios"
33 ], 37 ],
34 } 38 }
OLDNEW
« webrtc/api/BUILD.gn ('K') | « webrtc/api/BUILD.gn ('k') | webrtc/api/api_tests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698