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

Side by Side Diff: remoting/remoting.gyp

Issue 340993002: Revert of Remove NPAPI plugin from chromoting webapp. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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/host/win/version.rc.jinja2 ('k') | remoting/remoting_client.gypi » ('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 'chromium_code': 1, 7 'chromium_code': 1,
8 8
9 # Set this to run the jscompile checks after building the webapp. 9 # Set this to run the jscompile checks after building the webapp.
10 'run_jscompile%': 0, 10 'run_jscompile%': 0,
(...skipping 11 matching lines...) Expand all
22 22
23 'remoting_multi_process%': '<(remoting_multi_process)', 23 'remoting_multi_process%': '<(remoting_multi_process)',
24 'remoting_rdp_session%': 1, 24 'remoting_rdp_session%': 1,
25 25
26 'remoting_localize_path': 'tools/build/remoting_localize.py', 26 'remoting_localize_path': 'tools/build/remoting_localize.py',
27 27
28 'branding_path': '../remoting/branding_<(branding)', 28 'branding_path': '../remoting/branding_<(branding)',
29 29
30 'webapp_locale_dir': '<(SHARED_INTERMEDIATE_DIR)/remoting/webapp/_locales', 30 'webapp_locale_dir': '<(SHARED_INTERMEDIATE_DIR)/remoting/webapp/_locales',
31 31
32 'host_plugin_mime_type': 'application/vnd.chromium.remoting-host',
33
32 'conditions': [ 34 'conditions': [
33 ['OS=="mac"', { 35 ['OS=="mac"', {
34 'mac_bundle_id': '<!(python <(version_py_path) -f <(branding_path) -t "@ MAC_BUNDLE_ID@")', 36 'mac_bundle_id': '<!(python <(version_py_path) -f <(branding_path) -t "@ MAC_BUNDLE_ID@")',
35 'mac_creator': '<!(python <(version_py_path) -f <(branding_path) -t "@MA C_CREATOR@")', 37 'mac_creator': '<!(python <(version_py_path) -f <(branding_path) -t "@MA C_CREATOR@")',
38 'host_plugin_extension': 'plugin',
39 'host_plugin_prefix': '',
40 }],
41 ['os_posix == 1 and OS != "mac" and target_arch == "ia32"', {
42 # linux 32 bit
43 'host_plugin_extension': 'ia32.so',
44 'host_plugin_prefix': 'lib',
45 }],
46 ['os_posix == 1 and OS != "mac" and target_arch == "x64"', {
47 # linux 64 bit
48 'host_plugin_extension': 'x64.so',
49 'host_plugin_prefix': 'lib',
50 }],
51 ['os_posix == 1 and OS != "mac" and target_arch == "arm"', {
52 'host_plugin_extension': 'arm.so',
53 'host_plugin_prefix': 'lib',
54 }],
55 ['os_posix == 1 and OS != "mac" and target_arch == "arm64"', {
56 'host_plugin_extension': 'arm64.so',
57 'host_plugin_prefix': 'lib',
58 }],
59 ['os_posix == 1 and OS != "mac" and target_arch == "mipsel"', {
60 'host_plugin_extension': 'mipsel.so',
61 'host_plugin_prefix': 'lib',
36 }], 62 }],
37 ['OS=="win"', { 63 ['OS=="win"', {
64 'host_plugin_extension': 'dll',
65 'host_plugin_prefix': '',
66
38 # Each CLSID is a hash of the current version string salted with an 67 # Each CLSID is a hash of the current version string salted with an
39 # arbitrary GUID. This ensures that the newly installed COM classes will 68 # arbitrary GUID. This ensures that the newly installed COM classes will
40 # be used during/after upgrade even if there are old instances running 69 # be used during/after upgrade even if there are old instances running
41 # already. 70 # already.
42 # The IDs are not random to avoid rebuilding host when it's not 71 # The IDs are not random to avoid rebuilding host when it's not
43 # necessary. 72 # necessary.
44 'daemon_controller_clsid': 73 'daemon_controller_clsid':
45 '<!(python -c "import uuid; print uuid.uuid5(uuid.UUID(\'655bd819-c0 8c-4b04-80c2-f160739ff6ef\'), \'<(version_full)\')")', 74 '<!(python -c "import uuid; print uuid.uuid5(uuid.UUID(\'655bd819-c0 8c-4b04-80c2-f160739ff6ef\'), \'<(version_full)\')")',
46 'rdp_desktop_session_clsid': 75 'rdp_desktop_session_clsid':
47 '<!(python -c "import uuid; print uuid.uuid5(uuid.UUID(\'6a7699f0-ee 43-43e7-aa30-a6738f9bd470\'), \'<(version_full)\')")', 76 '<!(python -c "import uuid; print uuid.uuid5(uuid.UUID(\'6a7699f0-ee 43-43e7-aa30-a6738f9bd470\'), \'<(version_full)\')")',
(...skipping 28 matching lines...) Expand all
76 'remoting_test.gypi', 105 'remoting_test.gypi',
77 'remoting_version.gypi', 106 'remoting_version.gypi',
78 'remoting_webapp_files.gypi', 107 'remoting_webapp_files.gypi',
79 ], 108 ],
80 109
81 'target_defaults': { 110 'target_defaults': {
82 'defines': [ 111 'defines': [
83 'BINARY_CORE=1', 112 'BINARY_CORE=1',
84 'BINARY_DESKTOP=2', 113 'BINARY_DESKTOP=2',
85 'BINARY_HOST_ME2ME=3', 114 'BINARY_HOST_ME2ME=3',
86 'BINARY_NATIVE_MESSAGING_HOST=4', 115 'BINARY_HOST_PLUGIN=4',
87 'BINARY_REMOTE_ASSISTANCE_HOST=5', 116 'BINARY_NATIVE_MESSAGING_HOST=5',
117 'BINARY_REMOTE_ASSISTANCE_HOST=6',
88 ], 118 ],
89 'include_dirs': [ 119 'include_dirs': [
90 '..', # Root of Chrome checkout 120 '..', # Root of Chrome checkout
91 ], 121 ],
92 'variables': { 122 'variables': {
93 'win_debug_RuntimeChecks': '0', 123 'win_debug_RuntimeChecks': '0',
94 }, 124 },
95 'conditions': [ 125 'conditions': [
96 ['OS=="mac" and mac_breakpad==1', { 126 ['OS=="mac" and mac_breakpad==1', {
97 'defines': [ 127 'defines': [
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 'variables': { 184 'variables': {
155 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)', 185 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)',
156 'grit_resource_ids': 'resources/resource_ids', 186 'grit_resource_ids': 'resources/resource_ids',
157 'sources': [ 187 'sources': [
158 '<(SHARED_INTERMEDIATE_DIR)/main.html', 188 '<(SHARED_INTERMEDIATE_DIR)/main.html',
159 'base/resources_unittest.cc', 189 'base/resources_unittest.cc',
160 'host/continue_window_mac.mm', 190 'host/continue_window_mac.mm',
161 'host/disconnect_window_mac.mm', 191 'host/disconnect_window_mac.mm',
162 'host/installer/mac/uninstaller/remoting_uninstaller-InfoPlist.strings .jinja2', 192 'host/installer/mac/uninstaller/remoting_uninstaller-InfoPlist.strings .jinja2',
163 'host/mac/me2me_preference_pane-InfoPlist.strings.jinja2', 193 'host/mac/me2me_preference_pane-InfoPlist.strings.jinja2',
194 'host/plugin/host_plugin-InfoPlist.strings.jinja2',
164 'host/win/core.rc.jinja2', 195 'host/win/core.rc.jinja2',
165 'host/win/host_messages.mc.jinja2', 196 'host/win/host_messages.mc.jinja2',
166 'host/win/version.rc.jinja2', 197 'host/win/version.rc.jinja2',
167 'resources/play_store_resources.cc', 198 'resources/play_store_resources.cc',
168 'webapp/background.js', 199 'webapp/background.js',
169 'webapp/butter_bar.js', 200 'webapp/butter_bar.js',
170 'webapp/client_screen.js', 201 'webapp/client_screen.js',
171 'webapp/error.js', 202 'webapp/error.js',
172 'webapp/host_list.js', 203 'webapp/host_list.js',
173 'webapp/host_setup_dialog.js', 204 'webapp/host_setup_dialog.js',
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 ], 309 ],
279 'export_dependent_settings': [ 310 'export_dependent_settings': [
280 '../third_party/libjingle/libjingle.gyp:libjingle', 311 '../third_party/libjingle/libjingle.gyp:libjingle',
281 ], 312 ],
282 'sources': [ 313 'sources': [
283 '<@(remoting_protocol_sources)', 314 '<@(remoting_protocol_sources)',
284 ], 315 ],
285 }, # end of target 'remoting_protocol' 316 }, # end of target 'remoting_protocol'
286 ], # end of targets 317 ], # end of targets
287 } 318 }
OLDNEW
« no previous file with comments | « remoting/host/win/version.rc.jinja2 ('k') | remoting/remoting_client.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698