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

Side by Side Diff: jingle/jingle.gyp

Issue 11570014: Build jingle targets when webrtc is enabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | 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 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, # variables 8 }, # variables
9 'conditions': [ 9 'conditions': [
10 ['OS != "ios" and OS != "android"', { 10 ['enable_webrtc==1 or (OS != "ios" and OS != "android")', {
11 'targets': [ 11 'targets': [
12 # A library of various utils for integration with libjingle. 12 # A library of various utils for integration with libjingle.
13 { 13 {
14 'target_name': 'jingle_glue', 14 'target_name': 'jingle_glue',
15 'type': 'static_library', 15 'type': 'static_library',
16 'sources': [ 16 'sources': [
17 'glue/channel_socket_adapter.cc', 17 'glue/channel_socket_adapter.cc',
18 'glue/channel_socket_adapter.h', 18 'glue/channel_socket_adapter.h',
19 'glue/chrome_async_socket.cc', 19 'glue/chrome_async_socket.cc',
20 'glue/chrome_async_socket.h', 20 'glue/chrome_async_socket.h',
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 '../base/base.gyp:base', 207 '../base/base.gyp:base',
208 '../base/base.gyp:test_support_base', 208 '../base/base.gyp:test_support_base',
209 '../net/net.gyp:net', 209 '../net/net.gyp:net',
210 '../net/net.gyp:net_test_support', 210 '../net/net.gyp:net_test_support',
211 '../testing/gmock.gyp:gmock', 211 '../testing/gmock.gyp:gmock',
212 '../testing/gtest.gyp:gtest', 212 '../testing/gtest.gyp:gtest',
213 '../third_party/libjingle/libjingle.gyp:libjingle', 213 '../third_party/libjingle/libjingle.gyp:libjingle',
214 ], 214 ],
215 }, 215 },
216 ], 216 ],
217 }, { # OS == "ios" or OS == "android" 217 }, { # enable_webrtc != 1 and (OS == "ios" or OS == "android")
218 'targets': [ 218 'targets': [
219 # Stub targets as iOS/Android don't use libjingle. 219 # Stub targets as iOS/Android don't use libjingle when webrtc is disable d.
220 { 220 {
221 'target_name': 'jingle_glue', 221 'target_name': 'jingle_glue',
222 'type': 'none', 222 'type': 'none',
223 }, 223 },
224 { 224 {
225 'target_name': 'jingle_glue_test_util', 225 'target_name': 'jingle_glue_test_util',
226 'type': 'none', 226 'type': 'none',
227 }, 227 },
228 { 228 {
229 'target_name': 'notifier', 229 'target_name': 'notifier',
(...skipping 12 matching lines...) Expand all
242 ], 242 ],
243 }, 243 },
244 { 244 {
245 'target_name': 'notifier_test_util', 245 'target_name': 'notifier_test_util',
246 'type': 'none', 246 'type': 'none',
247 }, 247 },
248 ], 248 ],
249 }], 249 }],
250 ], 250 ],
251 } 251 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698