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

Side by Side Diff: remoting/remoting.gyp

Issue 11830019: Revert 175584 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1378/src/
Patch Set: Created 7 years, 11 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 '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': {
12 'conditions': [
13 # Enable the multi-process host on Windows by default.
14 ['OS=="win"', {
15 'remoting_multi_process%': 1,
16 }, {
17 'remoting_multi_process%': 0,
18 }],
19 ],
20 },
21
22 'remoting_host_linux_clipboard%': 1, 11 'remoting_host_linux_clipboard%': 1,
23 'remoting_multi_process%': '<(remoting_multi_process)', 12 'remoting_multi_process%': 0,
24 13
25 # The |major|, |build| and |patch| versions are inherited from Chrome. 14 # The |major|, |build| and |patch| versions are inherited from Chrome.
26 # Since Chrome's |minor| version is always '0', we replace it with a 15 # Since Chrome's |minor| version is always '0', we replace it with a
27 # Chromoting-specific patch version. 16 # Chromoting-specific patch version.
28 # Note that we check both the |chrome_version_path| file and the 17 # Note that we check both the |chrome_version_path| file and the
29 # |remoting_version_path| so that we can override the Chrome version 18 # |remoting_version_path| so that we can override the Chrome version
30 # numbers if needed. 19 # numbers if needed.
31 'version_py_path': '../chrome/tools/build/version.py', 20 'version_py_path': '../chrome/tools/build/version.py',
32 'remoting_version_path': '../remoting/VERSION', 21 'remoting_version_path': '../remoting/VERSION',
33 'chrome_version_path': '../chrome/VERSION', 22 'chrome_version_path': '../chrome/VERSION',
(...skipping 2349 matching lines...) Expand 10 before | Expand all | Expand 10 after
2383 '../base/allocator/allocator.gyp:allocator', 2372 '../base/allocator/allocator.gyp:allocator',
2384 ], 2373 ],
2385 }, 2374 },
2386 ], 2375 ],
2387 ], 2376 ],
2388 }], # end of 'toolkit_uses_gtk == 1' 2377 }], # end of 'toolkit_uses_gtk == 1'
2389 ], # end of 'conditions' 2378 ], # end of 'conditions'
2390 }, # end of target 'remoting_unittests' 2379 }, # end of target 'remoting_unittests'
2391 ], # end of targets 2380 ], # end of targets
2392 } 2381 }
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