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

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 comment Created 8 years, 5 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 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 '<(DEPTH)/chrome/installer/mac/pkg-dmg', 191 '<(DEPTH)/chrome/installer/mac/pkg-dmg',
191 ], 192 ],
192 }, 193 },
193 194
194 'target_defaults': { 195 'target_defaults': {
195 'defines': [ 196 'defines': [
196 ], 197 ],
197 'include_dirs': [ 198 'include_dirs': [
198 '..', # Root of Chrome checkout 199 '..', # Root of Chrome checkout
199 ], 200 ],
201 'conditions': [
202 ['remoting_audio == 1', {
203 'defines': [
204 'ENABLE_REMOTING_AUDIO',
205 ],
206 }],
207 ],
200 }, 208 },
201 209
202 'conditions': [ 210 'conditions': [
203 ['OS=="linux"', { 211 ['OS=="linux"', {
204 'targets': [ 212 'targets': [
205 # Linux breakpad processing 213 # Linux breakpad processing
206 { 214 {
207 'target_name': 'remoting_linux_symbols', 215 'target_name': 'remoting_linux_symbols',
208 'type': 'none', 216 'type': 'none',
209 'conditions': [ 217 'conditions': [
(...skipping 1572 matching lines...) Expand 10 before | Expand all | Expand 10 after
1782 '../base/allocator/allocator.gyp:allocator', 1790 '../base/allocator/allocator.gyp:allocator',
1783 ], 1791 ],
1784 }, 1792 },
1785 ], 1793 ],
1786 ], 1794 ],
1787 }], 1795 }],
1788 ], # end of 'conditions' 1796 ], # end of 'conditions'
1789 }, # end of target 'remoting_unittests' 1797 }, # end of target 'remoting_unittests'
1790 ], # end of targets 1798 ], # end of targets
1791 } 1799 }
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