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

Side by Side Diff: talk/build/merge_ios_libs.gyp

Issue 1493003002: Fix Mac ObjC PeerConnection API compilation. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years 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 | « no previous file | talk/libjingle.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 # 1 #
2 # libjingle 2 # libjingle
3 # Copyright 2015 Google Inc. 3 # Copyright 2015 Google Inc.
4 # 4 #
5 # Redistribution and use in source and binary forms, with or without 5 # Redistribution and use in source and binary forms, with or without
6 # modification, are permitted provided that the following conditions are met: 6 # modification, are permitted provided that the following conditions are met:
7 # 7 #
8 # 1. Redistributions of source code must retain the above copyright notice, 8 # 1. Redistributions of source code must retain the above copyright notice,
9 # this list of conditions and the following disclaimer. 9 # this list of conditions and the following disclaimer.
10 # 2. Redistributions in binary form must reproduce the above copyright notice, 10 # 2. Redistributions in binary form must reproduce the above copyright notice,
11 # this list of conditions and the following disclaimer in the documentation 11 # this list of conditions and the following disclaimer in the documentation
12 # and/or other materials provided with the distribution. 12 # and/or other materials provided with the distribution.
13 # 3. The name of the author may not be used to endorse or promote products 13 # 3. The name of the author may not be used to endorse or promote products
14 # derived from this software without specific prior written permission. 14 # derived from this software without specific prior written permission.
15 # 15 #
16 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 16 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
17 # WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 17 # WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
18 # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO 18 # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
19 # EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 19 # EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
20 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 20 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
21 # PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 21 # PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
22 # OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 22 # OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
23 # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 23 # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
24 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 24 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
25 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 26
27 { 27 {
28 'includes': ['common.gypi',], 28 'includes': ['common.gypi',],
29 'conditions': [ 29 'conditions': [
30 ['OS=="ios" or (OS=="mac" and mac_sdk>="10.8")', { 30 ['OS=="ios" or OS=="mac"', {
31 'targets': [ 31 'targets': [
32 { 32 {
33 'target_name': 'libjingle_peerconnection_objc_no_op', 33 'target_name': 'libjingle_peerconnection_objc_no_op',
34 'includes': [ 'objc_app.gypi' ], 34 'includes': [ 'objc_app.gypi' ],
35 'type': 'executable', 35 'type': 'executable',
36 'dependencies': [ 36 'dependencies': [
37 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_defa ult', 37 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_defa ult',
38 '../libjingle.gyp:libjingle_peerconnection_objc', 38 '../libjingle.gyp:libjingle_peerconnection_objc',
39 ], 39 ],
40 'sources': ['<(DEPTH)/webrtc/build/no_op.cc',], 40 'sources': ['<(DEPTH)/webrtc/build/no_op.cc',],
41 }, 41 },
42 ], 42 ],
43 }] 43 }]
44 ], 44 ],
45 } 45 }
OLDNEW
« no previous file with comments | « no previous file | talk/libjingle.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698