Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 185 'host/installer/mac/PrivilegedHelperTools/org.chromium.chromoting.me2me.sh ', | 186 'host/installer/mac/PrivilegedHelperTools/org.chromium.chromoting.me2me.sh ', |
| 186 'host/installer/mac/Scripts/keystone_install.sh', | 187 'host/installer/mac/Scripts/keystone_install.sh', |
| 187 'host/installer/mac/Scripts/remoting_postflight.sh', | 188 'host/installer/mac/Scripts/remoting_postflight.sh', |
| 188 'host/installer/mac/Scripts/remoting_preflight.sh', | 189 'host/installer/mac/Scripts/remoting_preflight.sh', |
| 189 'host/installer/mac/Keystone/GoogleSoftwareUpdate.pkg', | 190 'host/installer/mac/Keystone/GoogleSoftwareUpdate.pkg', |
| 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': { |
| 196 'conditions': [ | |
|
Sergey Ulanov
2012/07/24 20:26:21
nit: it's more common to put conditions at then en
kxing
2012/07/24 20:29:22
Done.
| |
| 197 ['remoting_audio == 1', { | |
| 198 'defines': [ | |
| 199 'ENABLE_REMOTING_AUDIO', | |
| 200 ], | |
| 201 }], | |
| 202 ], | |
| 195 'defines': [ | 203 'defines': [ |
| 196 ], | 204 ], |
| 197 'include_dirs': [ | 205 'include_dirs': [ |
| 198 '..', # Root of Chrome checkout | 206 '..', # Root of Chrome checkout |
| 199 ], | 207 ], |
| 200 }, | 208 }, |
| 201 | 209 |
| 202 'conditions': [ | 210 'conditions': [ |
| 203 ['OS=="linux"', { | 211 ['OS=="linux"', { |
| 204 'targets': [ | 212 'targets': [ |
| (...skipping 1577 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 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 } |
| OLD | NEW |