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

Side by Side Diff: mojo/mojo.gyp

Issue 187183002: Add creation of ServiceManager to Content (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge problem Created 6 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 | « mojo/gles2/command_buffer_client_impl.cc ('k') | mojo/mojo_examples.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 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 'target_defaults': { 6 'target_defaults': {
7 'conditions': [ 7 'conditions': [
8 ['mojo_shell_debug_url != ""', { 8 ['mojo_shell_debug_url != ""', {
9 'defines': [ 9 'defines': [
10 'MOJO_SHELL_DEBUG=1', 10 'MOJO_SHELL_DEBUG=1',
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 'environment/default_async_waiter_impl.h', 329 'environment/default_async_waiter_impl.h',
330 'environment/buffer_tls_impl.cc', 330 'environment/buffer_tls_impl.cc',
331 'environment/buffer_tls_impl.h', 331 'environment/buffer_tls_impl.h',
332 ], 332 ],
333 'include_dirs': [ 333 'include_dirs': [
334 '..', 334 '..',
335 ], 335 ],
336 }, 336 },
337 { 337 {
338 'target_name': 'mojo_service_manager', 338 'target_name': 'mojo_service_manager',
339 'type': 'static_library', 339 'type': '<(component)',
340 'defines': [
341 'MOJO_SERVICE_MANAGER_IMPLEMENTATION',
342 ],
340 'dependencies': [ 343 'dependencies': [
341 '../base/base.gyp:base', 344 '../base/base.gyp:base',
342 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 345 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
343 '../net/net.gyp:net', 346 '../net/net.gyp:net',
344 '../url/url.gyp:url_lib', 347 '../url/url.gyp:url_lib',
348 'mojo_environment_chromium',
345 'mojo_shell_bindings', 349 'mojo_shell_bindings',
346 ], 350 ],
347 'sources': [ 351 'sources': [
348 'service_manager/service_loader.h', 352 'service_manager/service_loader.h',
349 'service_manager/service_manager.cc', 353 'service_manager/service_manager.cc',
350 'service_manager/service_manager.h', 354 'service_manager/service_manager.h',
355 'service_manager/service_manager_export.h',
351 ], 356 ],
352 'export_dependent_settings': [ 357 'export_dependent_settings': [
353 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 358 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
359 'mojo_shell_bindings',
354 ], 360 ],
355 }, 361 },
356 { 362 {
357 'target_name': 'mojo_shell_lib', 363 'target_name': 'mojo_shell_lib',
358 'type': 'static_library', 364 'type': 'static_library',
359 'dependencies': [ 365 'dependencies': [
360 '../base/base.gyp:base', 366 '../base/base.gyp:base',
361 '../base/base.gyp:base_static', 367 '../base/base.gyp:base_static',
362 '../net/net.gyp:net', 368 '../net/net.gyp:net',
363 '../url/url.gyp:url_lib', 369 '../url/url.gyp:url_lib',
364 'mojo_gles2_impl', 370 'mojo_gles2_impl',
371 'mojo_service_manager',
365 'mojo_shell_bindings', 372 'mojo_shell_bindings',
366 'mojo_service_manager',
367 'mojo_system', 373 'mojo_system',
368 'mojo_system_impl', 374 'mojo_system_impl',
369 'mojo_native_viewport_service', 375 'mojo_native_viewport_service',
370 ], 376 ],
371 'includes': [ 'public/bindings/mojom_bindings_generator.gypi' ], 377 'includes': [ 'public/bindings/mojom_bindings_generator.gypi' ],
372 'sources': [ 378 'sources': [
373 'shell/app_child_process.cc', 379 'shell/app_child_process.cc',
374 'shell/app_child_process.h', 380 'shell/app_child_process.h',
375 'shell/app_child_process.mojom', 381 'shell/app_child_process.mojom',
376 'shell/app_child_process_host.cc', 382 'shell/app_child_process_host.cc',
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
412 }, 418 },
413 { 419 {
414 'target_name': 'mojo_shell', 420 'target_name': 'mojo_shell',
415 'type': 'executable', 421 'type': 'executable',
416 'dependencies': [ 422 'dependencies': [
417 '../base/base.gyp:base', 423 '../base/base.gyp:base',
418 '../ui/gl/gl.gyp:gl', 424 '../ui/gl/gl.gyp:gl',
419 '../url/url.gyp:url_lib', 425 '../url/url.gyp:url_lib',
420 'mojo_common_lib', 426 'mojo_common_lib',
421 'mojo_environment_chromium', 427 'mojo_environment_chromium',
422 'mojo_shell_bindings', 428 'mojo_service_manager',
423 'mojo_shell_lib', 429 'mojo_shell_lib',
424 'mojo_system', 430 'mojo_system',
425 'mojo_system_impl', 431 'mojo_system_impl',
426 ], 432 ],
427 'sources': [ 433 'sources': [
428 'shell/desktop/mojo_main.cc', 434 'shell/desktop/mojo_main.cc',
429 ], 435 ],
430 }, 436 },
431 { 437 {
432 'target_name': 'mojo_service_manager_unittests', 438 'target_name': 'mojo_service_manager_unittests',
433 'type': 'executable', 439 'type': 'executable',
434 'dependencies': [ 440 'dependencies': [
435 '../base/base.gyp:base', 441 '../base/base.gyp:base',
436 '../testing/gtest.gyp:gtest', 442 '../testing/gtest.gyp:gtest',
443 '../url/url.gyp:url_lib',
437 'mojo_bindings', 444 'mojo_bindings',
438 'mojo_environment_standalone', 445 'mojo_environment_standalone',
439 'mojo_run_all_unittests', 446 'mojo_run_all_unittests',
440 'mojo_service_manager', 447 'mojo_service_manager',
448 'mojo_shell_client',
441 'mojo_system', 449 'mojo_system',
442 'mojo_utility', 450 'mojo_utility',
443 ], 451 ],
444 'includes': [ 'public/bindings/mojom_bindings_generator.gypi' ], 452 'includes': [ 'public/bindings/mojom_bindings_generator.gypi' ],
445 'sources': [ 453 'sources': [
446 'service_manager/service_manager_unittest.cc', 454 'service_manager/service_manager_unittest.cc',
447 'service_manager/test.mojom', 455 'service_manager/test.mojom',
448 ], 456 ],
449 }, 457 },
450 { 458 {
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
581 'mojo_js_unittests.isolate', 589 'mojo_js_unittests.isolate',
582 ], 590 ],
583 'sources': [ 591 'sources': [
584 'mojo_js_unittests.isolate', 592 'mojo_js_unittests.isolate',
585 ], 593 ],
586 }, 594 },
587 ], 595 ],
588 }], 596 }],
589 ], 597 ],
590 } 598 }
OLDNEW
« no previous file with comments | « mojo/gles2/command_buffer_client_impl.cc ('k') | mojo/mojo_examples.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698