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

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

Issue 1673503002: Update build_ios_libs.sh script to build new Objective-C API (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Changes based on feedback 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
« talk/build/export_headers ('K') | « talk/build/merge_ios_libs ('k') | no next file » | 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,
(...skipping 16 matching lines...) Expand all
27 { 27 {
28 'includes': ['common.gypi',], 28 'includes': ['common.gypi',],
29 'conditions': [ 29 'conditions': [
30 ['OS=="ios" or OS=="mac"', { 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',
tkchin_webrtc 2016/02/17 22:15:58 might be nice to push the field trial default depe
hjon_webrtc 2016/02/18 19:26:41 Done.
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 {
43 'target_name': 'webrtc_api_objc_no_op',
44 'includes': [ 'objc_app.gypi' ],
45 'type': 'executable',
46 'dependencies': [
47 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_defa ult',
48 '<(webrtc_root)/api/api.gyp:rtc_api_objc',
49 ],
50 'sources': ['<(DEPTH)/webrtc/build/no_op.cc',],
51 },
42 ], 52 ],
43 }] 53 }]
44 ], 54 ],
45 } 55 }
OLDNEW
« talk/build/export_headers ('K') | « talk/build/merge_ios_libs ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698