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

Side by Side Diff: mojo/mojo.gyp

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
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',
11 'MOJO_SHELL_DEBUG_URL="<(mojo_shell_debug_url)"', 11 'MOJO_SHELL_DEBUG_URL="<(mojo_shell_debug_url)"',
12 ], 12 ],
13 }], 13 }],
14 ], 14 ],
15 }, 15 },
16 'includes': [ 16 'includes': [
17 'mojo_apps.gypi', 17 'mojo_apps.gypi',
18 'mojo_converters.gypi',
18 'mojo_examples.gypi', 19 'mojo_examples.gypi',
19 'mojo_services.gypi', 20 'mojo_services.gypi',
20 'mojo_variables.gypi', 21 'mojo_variables.gypi',
21 ], 22 ],
22 'targets': [ 23 'targets': [
23 { 24 {
24 # GN version: //mojo 25 # GN version: //mojo
25 'target_name': 'mojo', 26 'target_name': 'mojo',
26 'type': 'none', 27 'type': 'none',
27 'dependencies': [ 28 'dependencies': [
28 'edk/mojo_edk.gyp:mojo_edk', 29 'edk/mojo_edk.gyp:mojo_edk',
29 'mojo_application_manager', 30 'mojo_application_manager',
30 'mojo_application_manager_unittests', 31 'mojo_application_manager_unittests',
31 'mojo_apps_js_unittests', 32 'mojo_apps_js_unittests',
32 'mojo_base.gyp:mojo_base', 33 'mojo_base.gyp:mojo_base',
33 'mojo_clipboard', 34 'mojo_clipboard',
34 'mojo_clipboard_unittests', 35 'mojo_clipboard_unittests',
35 'mojo_compositor_app', 36 'mojo_compositor_app',
36 'mojo_content_handler_demo', 37 'mojo_content_handler_demo',
38 'mojo_converters',
39 'mojo_converters_unittests',
37 'mojo_echo_client', 40 'mojo_echo_client',
38 'mojo_echo_service', 41 'mojo_echo_service',
39 'mojo_example_apptests', 42 'mojo_example_apptests',
40 'mojo_example_service', 43 'mojo_example_service',
41 'mojo_geometry_lib',
42 'mojo_html_viewer', 44 'mojo_html_viewer',
43 'mojo_input_events_lib',
44 'mojo_js_content_handler', 45 'mojo_js_content_handler',
45 'mojo_js_standalone', 46 'mojo_js_standalone',
46 'mojo_js_unittests', 47 'mojo_js_unittests',
47 'mojo_native_viewport_service', 48 'mojo_native_viewport_service',
48 'mojo_network_service', 49 'mojo_network_service',
49 'mojo_pepper_container_app', 50 'mojo_pepper_container_app',
50 'mojo_png_viewer', 51 'mojo_png_viewer',
51 'mojo_sample_app', 52 'mojo_sample_app',
52 'mojo_shell', 53 'mojo_shell',
53 'mojo_shell_lib', 54 'mojo_shell_lib',
54 'mojo_shell_tests', 55 'mojo_shell_tests',
55 'mojo_surfaces_app', 56 'mojo_surfaces_app',
56 'mojo_surfaces_app', 57 'mojo_surfaces_app',
57 'mojo_surfaces_child_app', 58 'mojo_surfaces_child_app',
58 'mojo_surfaces_child_gl_app', 59 'mojo_surfaces_child_gl_app',
59 'mojo_surfaces_lib',
60 'mojo_surfaces_lib_unittests',
61 'mojo_surfaces_service', 60 'mojo_surfaces_service',
62 'mojo_test_app', 61 'mojo_test_app',
63 'mojo_test_request_tracker_app', 62 'mojo_test_request_tracker_app',
64 'mojo_view_manager_lib_unittests', 63 'mojo_view_manager_lib_unittests',
65 'mojo_wget', 64 'mojo_wget',
66 'services/public/mojo_services_public.gyp:mojo_services_public', 65 'services/public/mojo_services_public.gyp:mojo_services_public',
67 'public/mojo_public.gyp:mojo_public', 66 'public/mojo_public.gyp:mojo_public',
68 ], 67 ],
69 'conditions': [ 68 'conditions': [
70 ['use_aura==1', { 69 ['use_aura==1', {
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 { 352 {
354 # GN version: //mojo/cc 353 # GN version: //mojo/cc
355 'target_name': 'mojo_cc_support', 354 'target_name': 'mojo_cc_support',
356 'type': 'static_library', 355 'type': 'static_library',
357 'dependencies': [ 356 'dependencies': [
358 '../base/base.gyp:base', 357 '../base/base.gyp:base',
359 '../cc/cc.gyp:cc', 358 '../cc/cc.gyp:cc',
360 '../cc/cc.gyp:cc_surfaces', 359 '../cc/cc.gyp:cc_surfaces',
361 '../skia/skia.gyp:skia', 360 '../skia/skia.gyp:skia',
362 '../gpu/gpu.gyp:gles2_implementation', 361 '../gpu/gpu.gyp:gles2_implementation',
363 'mojo_geometry_lib', 362 'mojo_converters',
364 'mojo_surfaces_lib',
365 'services/public/mojo_services_public.gyp:mojo_surfaces_bindings', 363 'services/public/mojo_services_public.gyp:mojo_surfaces_bindings',
366 ], 364 ],
367 'includes': [ 365 'includes': [
368 'mojo_public_gles2_for_loadable_module.gypi', 366 'mojo_public_gles2_for_loadable_module.gypi',
369 ], 367 ],
370 'export_dependent_settings': [ 368 'export_dependent_settings': [
371 'services/public/mojo_services_public.gyp:mojo_surfaces_bindings', 369 'services/public/mojo_services_public.gyp:mojo_surfaces_bindings',
372 ], 370 ],
373 'sources': [ 371 'sources': [
374 'cc/context_provider_mojo.cc', 372 'cc/context_provider_mojo.cc',
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
525 # GN version: //mojo/aura 523 # GN version: //mojo/aura
526 'target_name': 'mojo_aura_support', 524 'target_name': 'mojo_aura_support',
527 'type': 'static_library', 525 'type': 'static_library',
528 'dependencies': [ 526 'dependencies': [
529 '../cc/cc.gyp:cc', 527 '../cc/cc.gyp:cc',
530 '../ui/aura/aura.gyp:aura', 528 '../ui/aura/aura.gyp:aura',
531 '../ui/compositor/compositor.gyp:compositor', 529 '../ui/compositor/compositor.gyp:compositor',
532 '../ui/events/events.gyp:events', 530 '../ui/events/events.gyp:events',
533 '../ui/events/events.gyp:events_base', 531 '../ui/events/events.gyp:events_base',
534 'mojo_cc_support', 532 'mojo_cc_support',
535 'mojo_geometry_lib', 533 'mojo_converters',
536 'mojo_surfaces_lib',
537 'mojo_view_manager_lib', 534 'mojo_view_manager_lib',
538 'public/mojo_public.gyp:mojo_application_base', 535 'public/mojo_public.gyp:mojo_application_base',
539 'public/mojo_public.gyp:mojo_application_bindings', 536 'public/mojo_public.gyp:mojo_application_bindings',
540 'services/public/mojo_services_public.gyp:mojo_native_viewport_bindi ngs', 537 'services/public/mojo_services_public.gyp:mojo_native_viewport_bindi ngs',
541 ], 538 ],
542 'includes': [ 539 'includes': [
543 'mojo_public_gles2_for_loadable_module.gypi', 540 'mojo_public_gles2_for_loadable_module.gypi',
544 ], 541 ],
545 'sources': [ 542 'sources': [
546 'aura/aura_init.cc', 543 'aura/aura_init.cc',
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
770 '../build/isolate.gypi', 767 '../build/isolate.gypi',
771 ], 768 ],
772 'sources': [ 769 'sources': [
773 'mojo_js_unittests.isolate', 770 'mojo_js_unittests.isolate',
774 ], 771 ],
775 }, 772 },
776 ], 773 ],
777 }], 774 }],
778 ], 775 ],
779 } 776 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698