| 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 | 10 |
| 11 'variables': { | 11 'variables': { |
| 12 'conditions': [ | 12 'conditions': [ |
| 13 # Enable the multi-process host on Windows by default. | 13 # Enable the multi-process host on Windows by default. |
| 14 ['OS=="win"', { | 14 ['OS=="win"', { |
| 15 'remoting_multi_process%': 1, | 15 'remoting_multi_process%': 1, |
| 16 }, { | 16 }, { |
| 17 'remoting_multi_process%': 0, | 17 'remoting_multi_process%': 0, |
| 18 }], | 18 }], |
| 19 ], | 19 ], |
| 20 }, | 20 }, |
| 21 | 21 |
| 22 'remoting_multi_process%': '<(remoting_multi_process)', | 22 'remoting_multi_process%': '<(remoting_multi_process)', |
| 23 'remoting_rdp_session%': 0, |
| 23 'remoting_use_apps_v2%': 0, | 24 'remoting_use_apps_v2%': 0, |
| 24 | 25 |
| 25 # The |major|, |build| and |patch| versions are inherited from Chrome. | 26 # The |major|, |build| and |patch| versions are inherited from Chrome. |
| 26 # Since Chrome's |minor| version is always '0', we replace it with a | 27 # Since Chrome's |minor| version is always '0', we replace it with a |
| 27 # Chromoting-specific patch version. | 28 # Chromoting-specific patch version. |
| 28 # Note that we check both the |chrome_version_path| file and the | 29 # Note that we check both the |chrome_version_path| file and the |
| 29 # |remoting_version_path| so that we can override the Chrome version | 30 # |remoting_version_path| so that we can override the Chrome version |
| 30 # numbers if needed. | 31 # numbers if needed. |
| 31 'version_py_path': '../chrome/tools/build/version.py', | 32 'version_py_path': '../chrome/tools/build/version.py', |
| 32 'remoting_version_path': '../remoting/VERSION', | 33 'remoting_version_path': '../remoting/VERSION', |
| (...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 257 ['OS=="mac" and mac_breakpad==1', { | 258 ['OS=="mac" and mac_breakpad==1', { |
| 258 'defines': [ | 259 'defines': [ |
| 259 'REMOTING_ENABLE_BREAKPAD' | 260 'REMOTING_ENABLE_BREAKPAD' |
| 260 ], | 261 ], |
| 261 }], | 262 }], |
| 262 ['OS=="win" and buildtype == "Official"', { | 263 ['OS=="win" and buildtype == "Official"', { |
| 263 'defines': [ | 264 'defines': [ |
| 264 'REMOTING_ENABLE_BREAKPAD' | 265 'REMOTING_ENABLE_BREAKPAD' |
| 265 ], | 266 ], |
| 266 }], | 267 }], |
| 268 ['OS=="win" and remoting_multi_process != 0 and \ |
| 269 remoting_rdp_session != 0', { |
| 270 'defines': [ |
| 271 'REMOTING_RDP_SESSION', |
| 272 ], |
| 273 }], |
| 267 ['remoting_multi_process != 0', { | 274 ['remoting_multi_process != 0', { |
| 268 'defines': [ | 275 'defines': [ |
| 269 'REMOTING_MULTI_PROCESS', | 276 'REMOTING_MULTI_PROCESS', |
| 270 ], | 277 ], |
| 271 }], | 278 }], |
| 272 ], | 279 ], |
| 273 }, | 280 }, |
| 274 | 281 |
| 275 'conditions': [ | 282 'conditions': [ |
| 276 ['enable_remoting_host==1', { | 283 ['enable_remoting_host==1', { |
| (...skipping 2340 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2617 '../base/allocator/allocator.gyp:allocator', | 2624 '../base/allocator/allocator.gyp:allocator', |
| 2618 ], | 2625 ], |
| 2619 }, | 2626 }, |
| 2620 ], | 2627 ], |
| 2621 ], | 2628 ], |
| 2622 }], # end of 'toolkit_uses_gtk == 1' | 2629 }], # end of 'toolkit_uses_gtk == 1' |
| 2623 ], # end of 'conditions' | 2630 ], # end of 'conditions' |
| 2624 }, # end of target 'remoting_unittests' | 2631 }, # end of target 'remoting_unittests' |
| 2625 ], # end of targets | 2632 ], # end of targets |
| 2626 } | 2633 } |
| OLD | NEW |