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

Side by Side Diff: remoting/chromoting.gyp

Issue 2724010: Revert 49298 - Broke compile - Token-based authentication for chromoting.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « remoting/base/constants.cc ('k') | remoting/client/host_connection.h » ('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) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2010 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 'target_defaults': { 6 'target_defaults': {
7 'defines': [ 7 'defines': [
8 ], 8 ],
9 'include_dirs': [ 9 'include_dirs': [
10 '..', # Root of Chrome checkout 10 '..', # Root of Chrome checkout
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 'client/host_connection.cc', 231 'client/host_connection.cc',
232 'client/host_connection.h', 232 'client/host_connection.h',
233 'client/simple_client.cc', 233 'client/simple_client.cc',
234 ], 234 ],
235 }, # end of target 'chromoting_simple_client' 235 }, # end of target 'chromoting_simple_client'
236 236
237 { 237 {
238 'target_name': 'chromoting_jingle_glue', 238 'target_name': 'chromoting_jingle_glue',
239 'type': '<(library)', 239 'type': '<(library)',
240 'dependencies': [ 240 'dependencies': [
241 # TODO(sergeyu): move all code that is shared between notifier and
242 # jingle_glue to a separate library and use it here.
243 '../chrome/chrome.gyp:notifier', 241 '../chrome/chrome.gyp:notifier',
244 '../third_party/libjingle/libjingle.gyp:libjingle', 242 '../third_party/libjingle/libjingle.gyp:libjingle',
245 '../third_party/libjingle/libjingle.gyp:libjingle_p2p', 243 '../third_party/libjingle/libjingle.gyp:libjingle_p2p',
246 ], 244 ],
247 'export_dependent_settings': [ 245 'export_dependent_settings': [
248 '../third_party/libjingle/libjingle.gyp:libjingle', 246 '../third_party/libjingle/libjingle.gyp:libjingle',
249 '../third_party/libjingle/libjingle.gyp:libjingle_p2p', 247 '../third_party/libjingle/libjingle.gyp:libjingle_p2p',
250 ], 248 ],
251 'sources': [ 249 'sources': [
252 'jingle_glue/iq_request.h', 250 'jingle_glue/iq_request.h',
253 'jingle_glue/iq_request.cc', 251 'jingle_glue/iq_request.cc',
254 'jingle_glue/jingle_channel.h', 252 'jingle_glue/jingle_channel.h',
255 'jingle_glue/jingle_channel.cc', 253 'jingle_glue/jingle_channel.cc',
256 'jingle_glue/jingle_client.h', 254 'jingle_glue/jingle_client.h',
257 'jingle_glue/jingle_client.cc', 255 'jingle_glue/jingle_client.cc',
258 'jingle_glue/jingle_info_task.h', 256 'jingle_glue/jingle_info_task.h',
259 'jingle_glue/jingle_info_task.cc', 257 'jingle_glue/jingle_info_task.cc',
260 'jingle_glue/jingle_thread.h', 258 'jingle_glue/jingle_thread.h',
261 'jingle_glue/jingle_thread.cc', 259 'jingle_glue/jingle_thread.cc',
262 'jingle_glue/relay_port_allocator.h', 260 'jingle_glue/relay_port_allocator.h',
263 'jingle_glue/relay_port_allocator.cc', 261 'jingle_glue/relay_port_allocator.cc',
264 ], 262 ],
265 }, # end of target 'chromoting_jingle_glue' 263 }, # end of target 'chromoting_jingle_glue'
266 264
267 { 265 {
268 'target_name': 'chromoting_jingle_test_client', 266 'target_name': 'chromoting_jingle_test_client',
269 'type': 'executable', 267 'type': 'executable',
270 'dependencies': [ 268 'dependencies': [
271 'chromoting_base',
272 'chromoting_jingle_glue', 269 'chromoting_jingle_glue',
273 '../media/media.gyp:media', 270 '../media/media.gyp:media',
274 ], 271 ],
275 'sources': [ 272 'sources': [
276 'jingle_glue/jingle_test_client.cc', 273 'jingle_glue/jingle_test_client.cc',
277 ], 274 ],
278 }, # end of target 'chromoting_jingle_test_client' 275 }, # end of target 'chromoting_jingle_test_client'
279 276
280 # Chromoting unit tests 277 # Chromoting unit tests
281 { 278 {
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
351 }, # end of target 'chromoting_unittests' 348 }, # end of target 'chromoting_unittests'
352 349
353 ], # end of targets 350 ], # end of targets
354 } 351 }
355 352
356 # Local Variables: 353 # Local Variables:
357 # tab-width:2 354 # tab-width:2
358 # indent-tabs-mode:nil 355 # indent-tabs-mode:nil
359 # End: 356 # End:
360 # vim: set expandtab tabstop=2 shiftwidth=2: 357 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « remoting/base/constants.cc ('k') | remoting/client/host_connection.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698