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

Side by Side Diff: remoting/remoting_host.gypi

Issue 431163002: webrtc deps in remoting should be inside a webrtc condition (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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 | « 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 'includes': [ 6 'includes': [
7 'remoting_host_linux.gypi', 7 'remoting_host_linux.gypi',
8 'remoting_host_mac.gypi', 8 'remoting_host_mac.gypi',
9 'remoting_host_win.gypi', 9 'remoting_host_win.gypi',
10 ], 10 ],
(...skipping 21 matching lines...) Expand all
32 'prefpane_bundle_name': '<!(python <(version_py_path) -f <(branding_ path) -t "@MAC_PREFPANE_BUNDLE_NAME@")', 32 'prefpane_bundle_name': '<!(python <(version_py_path) -f <(branding_ path) -t "@MAC_PREFPANE_BUNDLE_NAME@")',
33 }, 33 },
34 'dependencies': [ 34 'dependencies': [
35 'remoting_base', 35 'remoting_base',
36 'remoting_protocol', 36 'remoting_protocol',
37 'remoting_resources', 37 'remoting_resources',
38 '../base/base.gyp:base_i18n', 38 '../base/base.gyp:base_i18n',
39 '../crypto/crypto.gyp:crypto', 39 '../crypto/crypto.gyp:crypto',
40 '../google_apis/google_apis.gyp:google_apis', 40 '../google_apis/google_apis.gyp:google_apis',
41 '../ipc/ipc.gyp:ipc', 41 '../ipc/ipc.gyp:ipc',
42 '../third_party/webrtc/modules/modules.gyp:desktop_capture',
43 '../third_party/libjingle/libjingle.gyp:libpeerconnection',
44 '../ui/events/events.gyp:dom4_keycode_converter', 42 '../ui/events/events.gyp:dom4_keycode_converter',
45 ], 43 ],
46 'defines': [ 44 'defines': [
47 'HOST_BUNDLE_NAME="<(host_bundle_name)"', 45 'HOST_BUNDLE_NAME="<(host_bundle_name)"',
48 'PREFPANE_BUNDLE_NAME="<(prefpane_bundle_name)"', 46 'PREFPANE_BUNDLE_NAME="<(prefpane_bundle_name)"',
49 'VERSION=<(version_full)', 47 'VERSION=<(version_full)',
50 ], 48 ],
51 'sources': [ 49 'sources': [
52 'host/audio_capturer.cc', 50 'host/audio_capturer.cc',
53 'host/audio_capturer.h', 51 'host/audio_capturer.h',
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after
348 'mc.exe', 346 'mc.exe',
349 '-h', '<(output_dir)', 347 '-h', '<(output_dir)',
350 '-r', '<(output_dir)/.', 348 '-r', '<(output_dir)/.',
351 '-u', 349 '-u',
352 '<(RULE_INPUT_PATH)', 350 '<(RULE_INPUT_PATH)',
353 ], 351 ],
354 'process_outputs_as_sources': 1, 352 'process_outputs_as_sources': 1,
355 'message': 'Running message compiler on <(RULE_INPUT_PATH)', 353 'message': 'Running message compiler on <(RULE_INPUT_PATH)',
356 }], 354 }],
357 }], 355 }],
356 ['enable_webrtc==1', {
357 'dependencies': [
358 '../third_party/webrtc/modules/modules.gyp:desktop_capture',
359 '../third_party/libjingle/libjingle.gyp:libpeerconnection',
360 ],
361 }],
358 ], 362 ],
359 }, # end of target 'remoting_host' 363 }, # end of target 'remoting_host'
360 364
361 { 365 {
362 'target_name': 'remoting_native_messaging_base', 366 'target_name': 'remoting_native_messaging_base',
363 'type': 'static_library', 367 'type': 'static_library',
364 'variables': { 'enable_wexit_time_destructors': 1, }, 368 'variables': { 'enable_wexit_time_destructors': 1, },
365 'dependencies': [ 369 'dependencies': [
366 '../base/base.gyp:base', 370 '../base/base.gyp:base',
367 ], 371 ],
(...skipping 479 matching lines...) Expand 10 before | Expand all | Expand 10 after
847 }], # mac_breakpad==1 851 }], # mac_breakpad==1
848 ], # conditions 852 ], # conditions
849 }], # OS=mac 853 }], # OS=mac
850 ], 854 ],
851 }, # end of target 'remoting_it2me_native_messaging_host' 855 }, # end of target 'remoting_it2me_native_messaging_host'
852 ], # end of 'targets' 856 ], # end of 'targets'
853 }], # OS!="win" 857 }], # OS!="win"
854 858
855 ], # end of 'conditions' 859 ], # end of 'conditions'
856 } 860 }
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