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

Side by Side Diff: remoting/remoting.gyp

Issue 10795075: Created define to switch on/off audio. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments Created 8 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 | « remoting/protocol/session_config.cc ('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 # 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 # TODO(dmaclach): can we pick this up some other way? Right now it's 7 # TODO(dmaclach): can we pick this up some other way? Right now it's
8 # duplicated from chrome.gyp 8 # duplicated from chrome.gyp
9 'chromium_code': 1, 9 'chromium_code': 1,
10 'remoting_audio': 0,
10 # Use consistent strings across all platforms. Note that the plugin name 11 # Use consistent strings across all platforms. Note that the plugin name
11 # is brand-dependent and is defined further down. 12 # is brand-dependent and is defined further down.
12 # Must match host/plugin/constants.h 13 # Must match host/plugin/constants.h
13 'host_plugin_mime_type': 'application/vnd.chromium.remoting-host', 14 'host_plugin_mime_type': 'application/vnd.chromium.remoting-host',
14 'host_plugin_description': 'Allow another user to access your computer secur ely over the Internet.', 15 'host_plugin_description': 'Allow another user to access your computer secur ely over the Internet.',
15 16
16 # The version is composed from major & minor versions specific to remoting 17 # The version is composed from major & minor versions specific to remoting
17 # and build & patch versions inherited from Chrome. 18 # and build & patch versions inherited from Chrome.
18 'version_py_path': '../chrome/tools/build/version.py', 19 'version_py_path': '../chrome/tools/build/version.py',
19 'version_path': '../remoting/VERSION', 20 'version_path': '../remoting/VERSION',
(...skipping 1480 matching lines...) Expand 10 before | Expand all | Expand 10 after
1500 'jingle_glue/xmpp_signal_strategy.h', 1501 'jingle_glue/xmpp_signal_strategy.h',
1501 'jingle_glue/xmpp_socket_adapter.cc', 1502 'jingle_glue/xmpp_socket_adapter.cc',
1502 'jingle_glue/xmpp_socket_adapter.h', 1503 'jingle_glue/xmpp_socket_adapter.h',
1503 ], 1504 ],
1504 }, # end of target 'remoting_jingle_glue' 1505 }, # end of target 'remoting_jingle_glue'
1505 1506
1506 { 1507 {
1507 'target_name': 'remoting_protocol', 1508 'target_name': 'remoting_protocol',
1508 'type': 'static_library', 1509 'type': 'static_library',
1509 'variables': { 'enable_wexit_time_destructors': 1, }, 1510 'variables': { 'enable_wexit_time_destructors': 1, },
1511 'conditions': [
Sergey Ulanov 2012/07/24 19:49:59 Please move this condition to target_defaults sect
kxing 2012/07/24 20:11:52 Done.
1512 ['remoting_audio == 1', {
1513 'defines': [
1514 'ENABLE_REMOTING_AUDIO',
1515 ],
1516 }],
1517 ],
1510 'dependencies': [ 1518 'dependencies': [
1511 'remoting_base', 1519 'remoting_base',
1512 'remoting_jingle_glue', 1520 'remoting_jingle_glue',
1513 '../crypto/crypto.gyp:crypto', 1521 '../crypto/crypto.gyp:crypto',
1514 '../jingle/jingle.gyp:jingle_glue', 1522 '../jingle/jingle.gyp:jingle_glue',
1515 '../net/net.gyp:net', 1523 '../net/net.gyp:net',
1516 ], 1524 ],
1517 'export_dependent_settings': [ 1525 'export_dependent_settings': [
1518 'remoting_jingle_glue', 1526 'remoting_jingle_glue',
1519 ], 1527 ],
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
1777 '../base/allocator/allocator.gyp:allocator', 1785 '../base/allocator/allocator.gyp:allocator',
1778 ], 1786 ],
1779 }, 1787 },
1780 ], 1788 ],
1781 ], 1789 ],
1782 }], 1790 }],
1783 ], # end of 'conditions' 1791 ], # end of 'conditions'
1784 }, # end of target 'remoting_unittests' 1792 }, # end of target 'remoting_unittests'
1785 ], # end of targets 1793 ], # end of targets
1786 } 1794 }
OLDNEW
« no previous file with comments | « remoting/protocol/session_config.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698