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

Side by Side Diff: remoting/remoting.gyp

Issue 12563002: x11: Include X11 dependencies only when building with X11. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 9 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 | « media/media.gyp ('k') | ui/aura/aura.gyp » ('j') | 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
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 48
49 'webapp_locale_dir': '<(SHARED_INTERMEDIATE_DIR)/remoting/webapp/_locales', 49 'webapp_locale_dir': '<(SHARED_INTERMEDIATE_DIR)/remoting/webapp/_locales',
50 50
51 # Use consistent strings across all platforms. 51 # Use consistent strings across all platforms.
52 # These values must match host/plugin/constants.h 52 # These values must match host/plugin/constants.h
53 'host_plugin_mime_type': 'application/vnd.chromium.remoting-host', 53 'host_plugin_mime_type': 'application/vnd.chromium.remoting-host',
54 'host_plugin_description': '<!(python <(version_py_path) -f <(branding_path) -t "@HOST_PLUGIN_DESCRIPTION@")', 54 'host_plugin_description': '<!(python <(version_py_path) -f <(branding_path) -t "@HOST_PLUGIN_DESCRIPTION@")',
55 'host_plugin_name': '<!(python <(version_py_path) -f <(branding_path) -t "@H OST_PLUGIN_FILE_NAME@")', 55 'host_plugin_name': '<!(python <(version_py_path) -f <(branding_path) -t "@H OST_PLUGIN_FILE_NAME@")',
56 56
57 'conditions': [ 57 'conditions': [
58 # Remoting host is supported only on Windows, OSX and Linux. 58 # Remoting host is supported only on Windows, OSX and Linux (with X11).
59 ['OS=="win" or OS=="mac" or (OS=="linux" and chromeos==0)', { 59 ['OS=="win" or OS=="mac" or (OS=="linux" and chromeos==0 and use_x11==1)', {
60 'enable_remoting_host': 1, 60 'enable_remoting_host': 1,
61 }, { 61 }, {
62 'enable_remoting_host': 0, 62 'enable_remoting_host': 0,
63 }], 63 }],
64 ['OS=="mac"', { 64 ['OS=="mac"', {
65 'mac_bundle_id': '<!(python <(version_py_path) -f <(branding_path) -t "@ MAC_BUNDLE_ID@")', 65 'mac_bundle_id': '<!(python <(version_py_path) -f <(branding_path) -t "@ MAC_BUNDLE_ID@")',
66 'mac_creator': '<!(python <(version_py_path) -f <(branding_path) -t "@MA C_CREATOR@")', 66 'mac_creator': '<!(python <(version_py_path) -f <(branding_path) -t "@MA C_CREATOR@")',
67 'host_plugin_extension': 'plugin', 67 'host_plugin_extension': 'plugin',
68 'host_plugin_prefix': '', 68 'host_plugin_prefix': '',
69 }], 69 }],
(...skipping 2588 matching lines...) Expand 10 before | Expand all | Expand 10 after
2658 '../base/allocator/allocator.gyp:allocator', 2658 '../base/allocator/allocator.gyp:allocator',
2659 ], 2659 ],
2660 }, 2660 },
2661 ], 2661 ],
2662 ], 2662 ],
2663 }], # end of 'toolkit_uses_gtk == 1' 2663 }], # end of 'toolkit_uses_gtk == 1'
2664 ], # end of 'conditions' 2664 ], # end of 'conditions'
2665 }, # end of target 'remoting_unittests' 2665 }, # end of target 'remoting_unittests'
2666 ], # end of targets 2666 ], # end of targets
2667 } 2667 }
OLDNEW
« no previous file with comments | « media/media.gyp ('k') | ui/aura/aura.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698