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

Side by Side Diff: remoting/remoting.gyp

Issue 7216018: Move the Remoting Host plugin into its own sub-directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix missed path in remoting.gyp. Created 9 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/plugin/host_script_object.cc ('k') | 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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 # Use a consistent MIME-type independent of branding. 10 # Use a consistent MIME-type independent of branding.
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 'HOST_PLUGIN_MIME_TYPE=<(host_plugin_mime_type)', 160 'HOST_PLUGIN_MIME_TYPE=<(host_plugin_mime_type)',
161 ], 161 ],
162 'dependencies': [ 162 'dependencies': [
163 'remoting_base', 163 'remoting_base',
164 'remoting_host', 164 'remoting_host',
165 'remoting_jingle_glue', 165 'remoting_jingle_glue',
166 '../third_party/libvpx/libvpx.gyp:libvpx_lib', 166 '../third_party/libvpx/libvpx.gyp:libvpx_lib',
167 '../third_party/npapi/npapi.gyp:npapi', 167 '../third_party/npapi/npapi.gyp:npapi',
168 ], 168 ],
169 'sources': [ 169 'sources': [
170 'host/continue_window.h', 170 'host/plugin/host_plugin.cc',
171 'host/continue_window_mac.mm', 171 'host/plugin/host_plugin.def',
172 'host/continue_window_linux.cc', 172 'host/plugin/host_plugin.rc',
173 'host/continue_window_win.cc', 173 'host/plugin/host_plugin_resource.h',
174 'host/disconnect_window_linux.cc', 174 'host/plugin/host_plugin_utils.cc',
175 'host/disconnect_window_mac.h', 175 'host/plugin/host_plugin_utils.h',
176 'host/disconnect_window_mac.mm', 176 'host/plugin/host_script_object.cc',
177 'host/disconnect_window_win.cc', 177 'host/plugin/host_script_object.h',
178 'host/host_plugin.cc',
179 'host/host_plugin.def',
180 'host/host_plugin.rc',
181 'host/host_plugin_resource.h',
182 'host/host_plugin_utils.cc',
183 'host/host_plugin_utils.h',
184 'host/host_script_object.cc',
185 'host/host_script_object.h',
186 ], 178 ],
187 'conditions': [ 179 'conditions': [
188 ['OS=="mac"', { 180 ['OS=="mac"', {
189 'mac_bundle': 1, 181 'mac_bundle': 1,
190 'xcode_settings': { 182 'xcode_settings': {
191 'CHROMIUM_BUNDLE_ID': '<(mac_bundle_id)', 183 'CHROMIUM_BUNDLE_ID': '<(mac_bundle_id)',
192 'INFOPLIST_FILE': 'host/host_plugin-Info.plist', 184 'INFOPLIST_FILE': 'host/plugin/host_plugin-Info.plist',
193 'INFOPLIST_PREPROCESS': 'YES', 185 'INFOPLIST_PREPROCESS': 'YES',
194 'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'HOST_PLUGIN_MIME_TYPE=<(host_ plugin_mime_type)', 186 'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'HOST_PLUGIN_MIME_TYPE=<(host_ plugin_mime_type)',
195 'WRAPPER_EXTENSION': '<(plugin_extension)', 187 'WRAPPER_EXTENSION': '<(plugin_extension)',
196 'OTHER_LDFLAGS': [ # TODO(wez): Remove if libvpx gets PIC-fixed. 188 'OTHER_LDFLAGS': [ # TODO(wez): Remove if libvpx gets PIC-fixed.
197 # This is needed because at least part of libvpx is not 189 # This is needed because at least part of libvpx is not
198 # PIC-friendly, thus we need to instruct the linker to allow 190 # PIC-friendly, thus we need to instruct the linker to allow
199 # relocations for read-only segments for this target to be able 191 # relocations for read-only segments for this target to be able
200 # to generated the shared library on Mac. 192 # to generated the shared library on Mac.
201 # 193 #
202 # This hack is cribbed from ffmpeg.gyp, and makes someone called 194 # This hack is cribbed from ffmpeg.gyp, and makes someone called
203 # Mark sad, so at least I'm not alone. 195 # Mark sad, so at least I'm not alone.
204 '-Wl,-read_only_relocs,suppress', 196 '-Wl,-read_only_relocs,suppress',
205 ], 197 ],
206 }, 198 },
207 # TODO(mark): Come up with a fancier way to do this. It should 199 # TODO(mark): Come up with a fancier way to do this. It should
208 # only be necessary to list framework-Info.plist once, not the 200 # only be necessary to list framework-Info.plist once, not the
209 # three times it is listed here. 201 # three times it is listed here.
210 'mac_bundle_resources': [ 202 'mac_bundle_resources': [
211 'host/disconnect_window.xib', 203 'host/disconnect_window.xib',
212 'host/host_plugin-Info.plist', 204 'host/plugin/host_plugin-Info.plist',
213 ], 205 ],
214 'mac_bundle_resources!': [ 206 'mac_bundle_resources!': [
215 'host/host_plugin-Info.plist', 207 'host/plugin/host_plugin-Info.plist',
216 ], 208 ],
217 }], 209 }],
218 ['OS=="win"', { # TODO(wez): Remove if libvpx is built by MSVC. 210 ['OS=="win"', { # TODO(wez): Remove if libvpx is built by MSVC.
219 'msvs_settings': { 211 'msvs_settings': {
220 'VCLinkerTool': { 212 'VCLinkerTool': {
221 'AdditionalOptions!': [ 213 'AdditionalOptions!': [
222 '/safeseh', 214 '/safeseh',
223 ], 215 ],
224 }, 216 },
225 }, 217 },
226 }], 218 }],
227 ['OS!="win"', { 219 ['OS!="win"', {
228 'sources!': [ 220 'sources!': [
229 'host/host_plugin.def', 221 'host/plugin/host_plugin.def',
230 'host/host_plugin.rc', 222 'host/plugin/host_plugin.rc',
231 ], 223 ],
232 }], 224 }],
233 ], 225 ],
234 }, # end of target 'remoting_host_plugin' 226 }, # end of target 'remoting_host_plugin'
235 { 227 {
236 'target_name': 'webapp_it2me', 228 'target_name': 'webapp_it2me',
237 'type': 'none', 229 'type': 'none',
238 'dependencies': [ 230 'dependencies': [
239 'remoting_host_plugin', 231 'remoting_host_plugin',
240 ], 232 ],
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
369 'host/capturer_fake.h', 361 'host/capturer_fake.h',
370 'host/capturer_linux.cc', 362 'host/capturer_linux.cc',
371 'host/capturer_mac.cc', 363 'host/capturer_mac.cc',
372 'host/capturer_win.cc', 364 'host/capturer_win.cc',
373 'host/chromoting_host.cc', 365 'host/chromoting_host.cc',
374 'host/chromoting_host.h', 366 'host/chromoting_host.h',
375 'host/chromoting_host_context.cc', 367 'host/chromoting_host_context.cc',
376 'host/chromoting_host_context.h', 368 'host/chromoting_host_context.h',
377 'host/client_session.cc', 369 'host/client_session.cc',
378 'host/client_session.h', 370 'host/client_session.h',
371 'host/continue_window.h',
372 'host/continue_window_mac.mm',
373 'host/continue_window_linux.cc',
374 'host/continue_window_win.cc',
379 'host/curtain.h', 375 'host/curtain.h',
380 'host/curtain_linux.cc', 376 'host/curtain_linux.cc',
381 'host/curtain_mac.cc', 377 'host/curtain_mac.cc',
382 'host/curtain_win.cc', 378 'host/curtain_win.cc',
383 'host/desktop_environment.cc', 379 'host/desktop_environment.cc',
384 'host/desktop_environment.h', 380 'host/desktop_environment.h',
385 'host/differ.h', 381 'host/differ.h',
386 'host/differ.cc', 382 'host/differ.cc',
383 'host/disconnect_window_linux.cc',
384 'host/disconnect_window_mac.h',
385 'host/disconnect_window_mac.mm',
386 'host/disconnect_window_win.cc',
387 'host/event_executor.h', 387 'host/event_executor.h',
388 'host/event_executor_linux.cc', 388 'host/event_executor_linux.cc',
389 'host/event_executor_mac.cc', 389 'host/event_executor_mac.cc',
390 'host/event_executor_win.cc', 390 'host/event_executor_win.cc',
391 'host/heartbeat_sender.cc', 391 'host/heartbeat_sender.cc',
392 'host/heartbeat_sender.h', 392 'host/heartbeat_sender.h',
393 'host/host_config.cc', 393 'host/host_config.cc',
394 'host/host_config.h', 394 'host/host_config.h',
395 'host/host_key_pair.cc', 395 'host/host_key_pair.cc',
396 'host/host_key_pair.h', 396 'host/host_key_pair.h',
(...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after
783 ], # end of 'conditions' 783 ], # end of 'conditions'
784 }, # end of target 'remoting_unittests' 784 }, # end of target 'remoting_unittests'
785 ], # end of targets 785 ], # end of targets
786 } 786 }
787 787
788 # Local Variables: 788 # Local Variables:
789 # tab-width:2 789 # tab-width:2
790 # indent-tabs-mode:nil 790 # indent-tabs-mode:nil
791 # End: 791 # End:
792 # vim: set expandtab tabstop=2 shiftwidth=2: 792 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « remoting/host/plugin/host_script_object.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698