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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: mojo/mojo_examples.gypi

Issue 640893003: Move mojo/services/public/cpp TypeConverters to mojo/converters. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix GN. Created 6 years, 2 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
« mojo/converters/surfaces_utils.h ('K') | « mojo/mojo_converters.gypi ('k') | mojo/mojo_services.gypi » ('j') | mojo/services/window_manager/DEPS » ('J')
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 'targets': [ 6 'targets': [
7 { 7 {
8 # GN version: //mojo/examples/echo:client 8 # GN version: //mojo/examples/echo:client
9 'target_name': 'mojo_echo_client', 9 'target_name': 'mojo_echo_client',
10 'type': 'loadable_module', 10 'type': 'loadable_module',
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 'target_name': 'mojo_compositor_app', 160 'target_name': 'mojo_compositor_app',
161 'type': 'loadable_module', 161 'type': 'loadable_module',
162 'dependencies': [ 162 'dependencies': [
163 '../base/base.gyp:base', 163 '../base/base.gyp:base',
164 '../cc/cc.gyp:cc', 164 '../cc/cc.gyp:cc',
165 '../ui/gfx/gfx.gyp:gfx', 165 '../ui/gfx/gfx.gyp:gfx',
166 '../ui/gfx/gfx.gyp:gfx_geometry', 166 '../ui/gfx/gfx.gyp:gfx_geometry',
167 'mojo_base.gyp:mojo_application_chromium', 167 'mojo_base.gyp:mojo_application_chromium',
168 'mojo_base.gyp:mojo_common_lib', 168 'mojo_base.gyp:mojo_common_lib',
169 'mojo_cc_support', 169 'mojo_cc_support',
170 'mojo_geometry_lib', 170 'mojo_converters',
171 'services/public/mojo_services_public.gyp:mojo_geometry_bindings', 171 'services/public/mojo_services_public.gyp:mojo_geometry_bindings',
172 'services/public/mojo_services_public.gyp:mojo_gpu_bindings', 172 'services/public/mojo_services_public.gyp:mojo_gpu_bindings',
173 'services/public/mojo_services_public.gyp:mojo_native_viewport_bindings' , 173 'services/public/mojo_services_public.gyp:mojo_native_viewport_bindings' ,
174 '<(mojo_system_for_loadable_module)', 174 '<(mojo_system_for_loadable_module)',
175 ], 175 ],
176 'includes': [ 176 'includes': [
177 'mojo_public_gles2_for_loadable_module.gypi', 177 'mojo_public_gles2_for_loadable_module.gypi',
178 ], 178 ],
179 'sources': [ 179 'sources': [
180 'examples/compositor_app/compositor_app.cc', 180 'examples/compositor_app/compositor_app.cc',
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 'type': 'loadable_module', 366 'type': 'loadable_module',
367 'dependencies': [ 367 'dependencies': [
368 '../base/base.gyp:base', 368 '../base/base.gyp:base',
369 '../cc/cc.gyp:cc', 369 '../cc/cc.gyp:cc',
370 '../cc/cc.gyp:cc_surfaces', 370 '../cc/cc.gyp:cc_surfaces',
371 '../skia/skia.gyp:skia', 371 '../skia/skia.gyp:skia',
372 '../ui/gfx/gfx.gyp:gfx', 372 '../ui/gfx/gfx.gyp:gfx',
373 '../ui/gfx/gfx.gyp:gfx_geometry', 373 '../ui/gfx/gfx.gyp:gfx_geometry',
374 'mojo_base.gyp:mojo_application_chromium', 374 'mojo_base.gyp:mojo_application_chromium',
375 'mojo_base.gyp:mojo_common_lib', 375 'mojo_base.gyp:mojo_common_lib',
376 'mojo_geometry_lib', 376 'mojo_converters',
377 'mojo_surfaces_app_bindings', 377 'mojo_surfaces_app_bindings',
378 'mojo_surfaces_lib',
379 'services/public/mojo_services_public.gyp:mojo_geometry_bindings', 378 'services/public/mojo_services_public.gyp:mojo_geometry_bindings',
380 'services/public/mojo_services_public.gyp:mojo_gpu_bindings', 379 'services/public/mojo_services_public.gyp:mojo_gpu_bindings',
381 'services/public/mojo_services_public.gyp:mojo_native_viewport_bindings' , 380 'services/public/mojo_services_public.gyp:mojo_native_viewport_bindings' ,
382 'services/public/mojo_services_public.gyp:mojo_surfaces_bindings', 381 'services/public/mojo_services_public.gyp:mojo_surfaces_bindings',
383 'public/mojo_public.gyp:mojo_cpp_bindings', 382 'public/mojo_public.gyp:mojo_cpp_bindings',
384 '<(mojo_system_for_loadable_module)', 383 '<(mojo_system_for_loadable_module)',
385 ], 384 ],
386 'sources': [ 385 'sources': [
387 'examples/surfaces_app/embedder.cc', 386 'examples/surfaces_app/embedder.cc',
388 'examples/surfaces_app/embedder.h', 387 'examples/surfaces_app/embedder.h',
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
421 'type': 'loadable_module', 420 'type': 'loadable_module',
422 'dependencies': [ 421 'dependencies': [
423 '../base/base.gyp:base', 422 '../base/base.gyp:base',
424 '../cc/cc.gyp:cc', 423 '../cc/cc.gyp:cc',
425 '../cc/cc.gyp:cc_surfaces', 424 '../cc/cc.gyp:cc_surfaces',
426 '../skia/skia.gyp:skia', 425 '../skia/skia.gyp:skia',
427 '../ui/gfx/gfx.gyp:gfx', 426 '../ui/gfx/gfx.gyp:gfx',
428 '../ui/gfx/gfx.gyp:gfx_geometry', 427 '../ui/gfx/gfx.gyp:gfx_geometry',
429 'mojo_base.gyp:mojo_application_chromium', 428 'mojo_base.gyp:mojo_application_chromium',
430 'mojo_base.gyp:mojo_common_lib', 429 'mojo_base.gyp:mojo_common_lib',
431 'mojo_geometry_lib', 430 'mojo_converters',
432 'mojo_surfaces_app_bindings', 431 'mojo_surfaces_app_bindings',
433 'mojo_surfaces_lib',
434 'services/public/mojo_services_public.gyp:mojo_surface_id_bindings', 432 'services/public/mojo_services_public.gyp:mojo_surface_id_bindings',
435 'services/public/mojo_services_public.gyp:mojo_geometry_bindings', 433 'services/public/mojo_services_public.gyp:mojo_geometry_bindings',
436 'services/public/mojo_services_public.gyp:mojo_surfaces_bindings', 434 'services/public/mojo_services_public.gyp:mojo_surfaces_bindings',
437 'public/mojo_public.gyp:mojo_cpp_bindings', 435 'public/mojo_public.gyp:mojo_cpp_bindings',
438 '<(mojo_system_for_loadable_module)', 436 '<(mojo_system_for_loadable_module)',
439 ], 437 ],
440 'sources': [ 438 'sources': [
441 'examples/surfaces_app/child_app.cc', 439 'examples/surfaces_app/child_app.cc',
442 'examples/surfaces_app/child_impl.cc', 440 'examples/surfaces_app/child_impl.cc',
443 'examples/surfaces_app/child_impl.h', 441 'examples/surfaces_app/child_impl.h',
444 'examples/surfaces_app/surfaces_util.cc', 442 'examples/surfaces_app/surfaces_util.cc',
445 'examples/surfaces_app/surfaces_util.h', 443 'examples/surfaces_app/surfaces_util.h',
446 ], 444 ],
447 }, 445 },
448 { 446 {
449 # GN version: //mojo/examples/surfaces_app:child_gl_app 447 # GN version: //mojo/examples/surfaces_app:child_gl_app
450 'target_name': 'mojo_surfaces_child_gl_app', 448 'target_name': 'mojo_surfaces_child_gl_app',
451 'type': 'loadable_module', 449 'type': 'loadable_module',
452 'dependencies': [ 450 'dependencies': [
453 '../base/base.gyp:base', 451 '../base/base.gyp:base',
454 '../cc/cc.gyp:cc', 452 '../cc/cc.gyp:cc',
455 '../cc/cc.gyp:cc_surfaces', 453 '../cc/cc.gyp:cc_surfaces',
456 '../gpu/gpu.gyp:gpu', 454 '../gpu/gpu.gyp:gpu',
457 '../skia/skia.gyp:skia', 455 '../skia/skia.gyp:skia',
458 '../ui/gfx/gfx.gyp:gfx', 456 '../ui/gfx/gfx.gyp:gfx',
459 '../ui/gfx/gfx.gyp:gfx_geometry', 457 '../ui/gfx/gfx.gyp:gfx_geometry',
460 'mojo_base.gyp:mojo_application_chromium', 458 'mojo_base.gyp:mojo_application_chromium',
461 'mojo_base.gyp:mojo_common_lib', 459 'mojo_base.gyp:mojo_common_lib',
462 'mojo_geometry_lib', 460 'mojo_converters',
463 'mojo_surfaces_app_bindings', 461 'mojo_surfaces_app_bindings',
464 'mojo_surfaces_lib',
465 'services/public/mojo_services_public.gyp:mojo_geometry_bindings', 462 'services/public/mojo_services_public.gyp:mojo_geometry_bindings',
466 'services/public/mojo_services_public.gyp:mojo_gpu_bindings', 463 'services/public/mojo_services_public.gyp:mojo_gpu_bindings',
467 'services/public/mojo_services_public.gyp:mojo_surfaces_bindings', 464 'services/public/mojo_services_public.gyp:mojo_surfaces_bindings',
468 'public/mojo_public.gyp:mojo_cpp_bindings', 465 'public/mojo_public.gyp:mojo_cpp_bindings',
469 '<(mojo_system_for_loadable_module)', 466 '<(mojo_system_for_loadable_module)',
470 ], 467 ],
471 'includes': [ 468 'includes': [
472 'mojo_public_gles2_for_loadable_module.gypi', 469 'mojo_public_gles2_for_loadable_module.gypi',
473 ], 470 ],
474 'sources': [ 471 'sources': [
(...skipping 12 matching lines...) Expand all
487 'type': 'static_library', 484 'type': 'static_library',
488 'dependencies': [ 485 'dependencies': [
489 '../base/base.gyp:base', 486 '../base/base.gyp:base',
490 '../cc/cc.gyp:cc_surfaces', 487 '../cc/cc.gyp:cc_surfaces',
491 '../gpu/gpu.gyp:gpu', 488 '../gpu/gpu.gyp:gpu',
492 '../skia/skia.gyp:skia', 489 '../skia/skia.gyp:skia',
493 '../ui/gfx/gfx.gyp:gfx', 490 '../ui/gfx/gfx.gyp:gfx',
494 '../ui/gfx/gfx.gyp:gfx_geometry', 491 '../ui/gfx/gfx.gyp:gfx_geometry',
495 '../third_party/khronos/khronos.gyp:khronos_headers', 492 '../third_party/khronos/khronos.gyp:khronos_headers',
496 'mojo_base.gyp:mojo_application_chromium', 493 'mojo_base.gyp:mojo_application_chromium',
497 'mojo_geometry_lib', 494 'mojo_converters',
498 'mojo_surfaces_lib',
499 'public/mojo_public.gyp:mojo_application_bindings', 495 'public/mojo_public.gyp:mojo_application_bindings',
500 'services/public/mojo_services_public.gyp:mojo_geometry_bindings', 496 'services/public/mojo_services_public.gyp:mojo_geometry_bindings',
501 'services/public/mojo_services_public.gyp:mojo_gpu_bindings', 497 'services/public/mojo_services_public.gyp:mojo_gpu_bindings',
502 'services/public/mojo_services_public.gyp:mojo_surface_id_bindings', 498 'services/public/mojo_services_public.gyp:mojo_surface_id_bindings',
503 'services/public/mojo_services_public.gyp:mojo_surfaces_bindings', 499 'services/public/mojo_services_public.gyp:mojo_surfaces_bindings',
504 'services/public/mojo_services_public.gyp:mojo_view_manager_bindings', 500 'services/public/mojo_services_public.gyp:mojo_view_manager_bindings',
505 ], 501 ],
506 'includes': [ 502 'includes': [
507 'mojo_public_gles2_for_loadable_module.gypi', 503 'mojo_public_gles2_for_loadable_module.gypi',
508 ], 504 ],
(...skipping 19 matching lines...) Expand all
528 '../base/base.gyp:base', 524 '../base/base.gyp:base',
529 '../cc/cc.gyp:cc', 525 '../cc/cc.gyp:cc',
530 '../ui/aura/aura.gyp:aura', 526 '../ui/aura/aura.gyp:aura',
531 '../ui/base/ui_base.gyp:ui_base', 527 '../ui/base/ui_base.gyp:ui_base',
532 '../ui/compositor/compositor.gyp:compositor', 528 '../ui/compositor/compositor.gyp:compositor',
533 '../ui/gfx/gfx.gyp:gfx', 529 '../ui/gfx/gfx.gyp:gfx',
534 '../ui/gfx/gfx.gyp:gfx_geometry', 530 '../ui/gfx/gfx.gyp:gfx_geometry',
535 'mojo_aura_support', 531 'mojo_aura_support',
536 'mojo_base.gyp:mojo_application_chromium', 532 'mojo_base.gyp:mojo_application_chromium',
537 'mojo_base.gyp:mojo_common_lib', 533 'mojo_base.gyp:mojo_common_lib',
538 'mojo_geometry_lib', 534 'mojo_converters',
539 'mojo_view_manager_lib', 535 'mojo_view_manager_lib',
540 'services/public/mojo_services_public.gyp:mojo_geometry_bindings', 536 'services/public/mojo_services_public.gyp:mojo_geometry_bindings',
541 '<(mojo_system_for_loadable_module)', 537 '<(mojo_system_for_loadable_module)',
542 ], 538 ],
543 'sources': [ 539 'sources': [
544 'examples/aura_demo/aura_demo.cc', 540 'examples/aura_demo/aura_demo.cc',
545 ], 541 ],
546 }, 542 },
547 { 543 {
548 # GN version: //mojo/examples/aura_demo:init 544 # GN version: //mojo/examples/aura_demo:init
(...skipping 24 matching lines...) Expand all
573 '../ui/compositor/compositor.gyp:compositor', 569 '../ui/compositor/compositor.gyp:compositor',
574 '../ui/gfx/gfx.gyp:gfx', 570 '../ui/gfx/gfx.gyp:gfx',
575 '../ui/gfx/gfx.gyp:gfx_geometry', 571 '../ui/gfx/gfx.gyp:gfx_geometry',
576 '../ui/resources/ui_resources.gyp:ui_resources', 572 '../ui/resources/ui_resources.gyp:ui_resources',
577 '../ui/resources/ui_resources.gyp:ui_test_pak', 573 '../ui/resources/ui_resources.gyp:ui_test_pak',
578 '../ui/views/views.gyp:views', 574 '../ui/views/views.gyp:views',
579 '../url/url.gyp:url_lib', 575 '../url/url.gyp:url_lib',
580 'mojo_aura_support', 576 'mojo_aura_support',
581 'mojo_base.gyp:mojo_application_chromium', 577 'mojo_base.gyp:mojo_application_chromium',
582 'mojo_base.gyp:mojo_common_lib', 578 'mojo_base.gyp:mojo_common_lib',
583 'mojo_geometry_lib', 579 'mojo_converters',
584 'mojo_input_events_lib',
585 'mojo_view_manager_lib', 580 'mojo_view_manager_lib',
586 'mojo_views_support', 581 'mojo_views_support',
587 'mojo_window_manager_bindings', 582 'mojo_window_manager_bindings',
588 'services/public/mojo_services_public.gyp:mojo_geometry_bindings', 583 'services/public/mojo_services_public.gyp:mojo_geometry_bindings',
589 'services/public/mojo_services_public.gyp:mojo_navigation_bindings', 584 'services/public/mojo_services_public.gyp:mojo_navigation_bindings',
590 'services/public/mojo_services_public.gyp:mojo_view_manager_bindings ', 585 'services/public/mojo_services_public.gyp:mojo_view_manager_bindings ',
591 '<(mojo_system_for_loadable_module)', 586 '<(mojo_system_for_loadable_module)',
592 ], 587 ],
593 'sources': [ 588 'sources': [
594 'examples/browser/browser.cc', 589 'examples/browser/browser.cc',
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
639 '../ui/compositor/compositor.gyp:compositor', 634 '../ui/compositor/compositor.gyp:compositor',
640 '../ui/gfx/gfx.gyp:gfx', 635 '../ui/gfx/gfx.gyp:gfx',
641 '../ui/gfx/gfx.gyp:gfx_geometry', 636 '../ui/gfx/gfx.gyp:gfx_geometry',
642 '../ui/resources/ui_resources.gyp:ui_resources', 637 '../ui/resources/ui_resources.gyp:ui_resources',
643 '../ui/resources/ui_resources.gyp:ui_test_pak', 638 '../ui/resources/ui_resources.gyp:ui_test_pak',
644 '../ui/views/views.gyp:views', 639 '../ui/views/views.gyp:views',
645 '../url/url.gyp:url_lib', 640 '../url/url.gyp:url_lib',
646 'mojo_aura_support', 641 'mojo_aura_support',
647 'mojo_base.gyp:mojo_application_chromium', 642 'mojo_base.gyp:mojo_application_chromium',
648 'mojo_base.gyp:mojo_common_lib', 643 'mojo_base.gyp:mojo_common_lib',
649 'mojo_geometry_lib', 644 'mojo_converters',
650 'mojo_input_events_lib',
651 'mojo_keyboard_bindings', 645 'mojo_keyboard_bindings',
652 'mojo_view_manager_lib', 646 'mojo_view_manager_lib',
653 'mojo_views_support', 647 'mojo_views_support',
654 'services/public/mojo_services_public.gyp:mojo_geometry_bindings', 648 'services/public/mojo_services_public.gyp:mojo_geometry_bindings',
655 'services/public/mojo_services_public.gyp:mojo_navigation_bindings', 649 'services/public/mojo_services_public.gyp:mojo_navigation_bindings',
656 'services/public/mojo_services_public.gyp:mojo_view_manager_bindings ', 650 'services/public/mojo_services_public.gyp:mojo_view_manager_bindings ',
657 '<(mojo_system_for_loadable_module)', 651 '<(mojo_system_for_loadable_module)',
658 ], 652 ],
659 'sources': [ 653 'sources': [
660 'examples/keyboard/keyboard_delegate.h', 654 'examples/keyboard/keyboard_delegate.h',
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
706 '../ui/base/ui_base.gyp:ui_base', 700 '../ui/base/ui_base.gyp:ui_base',
707 '../ui/gfx/gfx.gyp:gfx', 701 '../ui/gfx/gfx.gyp:gfx',
708 '../ui/gfx/gfx.gyp:gfx_geometry', 702 '../ui/gfx/gfx.gyp:gfx_geometry',
709 '../ui/resources/ui_resources.gyp:ui_resources', 703 '../ui/resources/ui_resources.gyp:ui_resources',
710 '../ui/resources/ui_resources.gyp:ui_test_pak', 704 '../ui/resources/ui_resources.gyp:ui_test_pak',
711 '../ui/views/views.gyp:views', 705 '../ui/views/views.gyp:views',
712 '../ui/wm/wm.gyp:wm', 706 '../ui/wm/wm.gyp:wm',
713 'mojo_aura_support', 707 'mojo_aura_support',
714 'mojo_base.gyp:mojo_application_chromium', 708 'mojo_base.gyp:mojo_application_chromium',
715 'mojo_core_window_manager_lib', 709 'mojo_core_window_manager_lib',
716 'mojo_geometry_lib', 710 'mojo_converters',
717 'mojo_input_events_lib',
718 'mojo_keyboard_bindings', 711 'mojo_keyboard_bindings',
719 'mojo_view_manager_lib', 712 'mojo_view_manager_lib',
720 'mojo_views_support', 713 'mojo_views_support',
721 'mojo_window_manager_bindings', 714 'mojo_window_manager_bindings',
722 'public/mojo_public.gyp:mojo_cpp_bindings', 715 'public/mojo_public.gyp:mojo_cpp_bindings',
723 'public/mojo_public.gyp:mojo_utility', 716 'public/mojo_public.gyp:mojo_utility',
724 'services/public/mojo_services_public.gyp:mojo_geometry_bindings', 717 'services/public/mojo_services_public.gyp:mojo_geometry_bindings',
725 'services/public/mojo_services_public.gyp:mojo_navigation_bindings', 718 'services/public/mojo_services_public.gyp:mojo_navigation_bindings',
726 '<(mojo_system_for_loadable_module)', 719 '<(mojo_system_for_loadable_module)',
727 ], 720 ],
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
788 # GN version: //mojo/examples/media_viewer 781 # GN version: //mojo/examples/media_viewer
789 'target_name': 'mojo_media_viewer', 782 'target_name': 'mojo_media_viewer',
790 'type': 'loadable_module', 783 'type': 'loadable_module',
791 'dependencies': [ 784 'dependencies': [
792 '../base/base.gyp:base', 785 '../base/base.gyp:base',
793 '../skia/skia.gyp:skia', 786 '../skia/skia.gyp:skia',
794 '../ui/gfx/gfx.gyp:gfx', 787 '../ui/gfx/gfx.gyp:gfx',
795 '../ui/gfx/gfx.gyp:gfx_geometry', 788 '../ui/gfx/gfx.gyp:gfx_geometry',
796 '../ui/views/views.gyp:views', 789 '../ui/views/views.gyp:views',
797 'mojo_base.gyp:mojo_application_chromium', 790 'mojo_base.gyp:mojo_application_chromium',
798 'mojo_input_events_lib', 791 'mojo_converters',
799 'mojo_media_viewer_bindings', 792 'mojo_media_viewer_bindings',
800 'mojo_view_manager_lib', 793 'mojo_view_manager_lib',
801 'mojo_views_support', 794 'mojo_views_support',
802 'services/public/mojo_services_public.gyp:mojo_navigation_bindings', 795 'services/public/mojo_services_public.gyp:mojo_navigation_bindings',
803 'services/public/mojo_services_public.gyp:mojo_view_manager_bindings ', 796 'services/public/mojo_services_public.gyp:mojo_view_manager_bindings ',
804 '<(mojo_system_for_loadable_module)', 797 '<(mojo_system_for_loadable_module)',
805 ], 798 ],
806 'sources': [ 799 'sources': [
807 'examples/media_viewer/media_viewer.cc', 800 'examples/media_viewer/media_viewer.cc',
808 ], 801 ],
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
905 '<(mojo_system_for_loadable_module)', 898 '<(mojo_system_for_loadable_module)',
906 ], 899 ],
907 'sources': [ 900 'sources': [
908 'examples/wm_flow/embedded/embedded.cc', 901 'examples/wm_flow/embedded/embedded.cc',
909 ], 902 ],
910 }, 903 },
911 ], 904 ],
912 }], 905 }],
913 ], 906 ],
914 } 907 }
OLDNEW
« mojo/converters/surfaces_utils.h ('K') | « mojo/mojo_converters.gypi ('k') | mojo/mojo_services.gypi » ('j') | mojo/services/window_manager/DEPS » ('J')

Powered by Google App Engine
This is Rietveld 408576698