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

Side by Side Diff: webrtc/build/ios/merge_ios_libs.gyp

Issue 2296613002: Delete talk directory, and references from build_ios_libs.sh. (Closed)
Patch Set: Update filenames for c -> c++ conversion. Created 4 years, 3 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
« no previous file with comments | « webrtc/build/ios/build_ios_libs.sh ('k') | webrtc/webrtc_examples.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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': ['../common.gypi',], 10 'includes': ['../common.gypi',],
11 'conditions': [ 11 'conditions': [
12 ['OS=="ios" or OS=="mac"', { 12 ['OS=="ios" or OS=="mac"', {
13 'targets': [ 13 'targets': [
14 { 14 {
15 'target_name': 'libjingle_peerconnection_objc_no_op',
16 'includes': [ 'objc_app.gypi' ],
17 'type': 'executable',
18 'dependencies': [
19 '../../../talk/app/webrtc/legacy_objc_api.gyp:libjingle_peerconnecti on_objc',
20 ],
21 'sources': ['no_op.cc',],
22 },
23 {
24 'target_name': 'rtc_sdk_peerconnection_objc_no_op', 15 'target_name': 'rtc_sdk_peerconnection_objc_no_op',
25 'includes': [ 'objc_app.gypi' ], 16 'includes': [ 'objc_app.gypi' ],
26 'type': 'executable', 17 'type': 'executable',
27 'dependencies': [ 18 'dependencies': [
28 '<(webrtc_root)/sdk/sdk.gyp:rtc_sdk_peerconnection_objc', 19 '<(webrtc_root)/sdk/sdk.gyp:rtc_sdk_peerconnection_objc',
29 ], 20 ],
30 'sources': ['no_op.cc',], 21 'sources': ['no_op.cc',],
31 }, 22 },
32 ], 23 ],
33 }] 24 }]
34 ], 25 ],
35 } 26 }
OLDNEW
« no previous file with comments | « webrtc/build/ios/build_ios_libs.sh ('k') | webrtc/webrtc_examples.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698