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

Side by Side Diff: webrtc/libjingle_examples.gyp

Issue 1363573002: Wire up transport sequence number / send time callbacks to webrtc via libjingle. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Add missing updated_options Created 5 years, 2 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 # Copyright 2012 The WebRTC Project Authors. All rights reserved. 2 # Copyright 2012 The WebRTC Project Authors. All rights reserved.
3 # 3 #
4 # Use of this source code is governed by a BSD-style license 4 # Use of this source code is governed by a BSD-style license
5 # that can be found in the LICENSE file in the root of the source 5 # that can be found in the LICENSE file in the root of the source
6 # tree. An additional intellectual property rights grant can be found 6 # tree. An additional intellectual property rights grant can be found
7 # in the file PATENTS. All contributing project authors may 7 # in the file PATENTS. All contributing project authors may
8 # be found in the AUTHORS file in the root of the source tree. 8 # be found in the AUTHORS file in the root of the source tree.
9 9
10 { 10 {
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 'sources': [ 74 'sources': [
75 'examples/peerconnection/client/conductor.cc', 75 'examples/peerconnection/client/conductor.cc',
76 'examples/peerconnection/client/conductor.h', 76 'examples/peerconnection/client/conductor.h',
77 'examples/peerconnection/client/defaults.cc', 77 'examples/peerconnection/client/defaults.cc',
78 'examples/peerconnection/client/defaults.h', 78 'examples/peerconnection/client/defaults.h',
79 'examples/peerconnection/client/peer_connection_client.cc', 79 'examples/peerconnection/client/peer_connection_client.cc',
80 'examples/peerconnection/client/peer_connection_client.h', 80 'examples/peerconnection/client/peer_connection_client.h',
81 ], 81 ],
82 'dependencies': [ 82 'dependencies': [
83 '../talk/libjingle.gyp:libjingle_peerconnection', 83 '../talk/libjingle.gyp:libjingle_peerconnection',
84 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_defa ult',
84 '<@(libjingle_tests_additional_deps)', 85 '<@(libjingle_tests_additional_deps)',
85 ], 86 ],
86 'conditions': [ 87 'conditions': [
87 ['build_json==1', { 88 ['build_json==1', {
88 'dependencies': [ 89 'dependencies': [
89 '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp', 90 '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
90 ], 91 ],
91 }], 92 }],
92 # TODO(ronghuawu): Move these files to a win/ directory then they 93 # TODO(ronghuawu): Move these files to a win/ directory then they
93 # can be excluded automatically. 94 # can be excluded automatically.
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 }, # target peerconnection_client 133 }, # target peerconnection_client
133 ], # targets 134 ], # targets
134 }], # OS=="linux" or OS=="win" 135 }], # OS=="linux" or OS=="win"
135 136
136 ['OS=="ios" or (OS=="mac" and target_arch!="ia32" and mac_sdk>="10.8")', { 137 ['OS=="ios" or (OS=="mac" and target_arch!="ia32" and mac_sdk>="10.8")', {
137 'targets': [ 138 'targets': [
138 { 139 {
139 'target_name': 'apprtc_common', 140 'target_name': 'apprtc_common',
140 'type': 'static_library', 141 'type': 'static_library',
141 'dependencies': [ 142 'dependencies': [
143 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_defa ult',
142 '../talk/libjingle.gyp:libjingle_peerconnection_objc', 144 '../talk/libjingle.gyp:libjingle_peerconnection_objc',
143 ], 145 ],
144 'sources': [ 146 'sources': [
145 'examples/objc/AppRTCDemo/common/ARDUtilities.h', 147 'examples/objc/AppRTCDemo/common/ARDUtilities.h',
146 'examples/objc/AppRTCDemo/common/ARDUtilities.m', 148 'examples/objc/AppRTCDemo/common/ARDUtilities.m',
147 ], 149 ],
148 'include_dirs': [ 150 'include_dirs': [
149 'examples/objc/AppRTCDemo/common', 151 'examples/objc/AppRTCDemo/common',
150 ], 152 ],
151 'direct_dependent_settings': { 153 'direct_dependent_settings': {
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 'apk_name': 'AppRTCDemoTest', 400 'apk_name': 'AppRTCDemoTest',
399 'java_in_dir': 'examples/androidtests', 401 'java_in_dir': 'examples/androidtests',
400 'is_test_apk': 1, 402 'is_test_apk': 1,
401 }, 403 },
402 'includes': [ '../build/java_apk.gypi' ], 404 'includes': [ '../build/java_apk.gypi' ],
403 }, 405 },
404 ], # targets 406 ], # targets
405 }], # OS=="android" 407 }], # OS=="android"
406 ], 408 ],
407 } 409 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698