| OLD | NEW |
| 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 23 matching lines...) Expand all Loading... |
| 34 # NOTE: component != "shared_library" implies that we are generating a | 34 # NOTE: component != "shared_library" implies that we are generating a |
| 35 # static library, and in that case, it is expected that the target | 35 # static library, and in that case, it is expected that the target |
| 36 # listing the component as a dependency will specify either mojo_system | 36 # listing the component as a dependency will specify either mojo_system |
| 37 # or mojo_system_impl to link against. This enables multiple targets to | 37 # or mojo_system_impl to link against. This enables multiple targets to |
| 38 # link against the same component library without having to agree on | 38 # link against the same component library without having to agree on |
| 39 # which Mojo system library they are using. | 39 # which Mojo system library they are using. |
| 40 # | 40 # |
| 41 ['component=="shared_library"', { | 41 ['component=="shared_library"', { |
| 42 'mojo_system_for_component': "mojo_system_impl", | 42 'mojo_system_for_component': "mojo_system_impl", |
| 43 'mojo_system_for_loadable_module': "mojo_system_impl", | 43 'mojo_system_for_loadable_module': "mojo_system_impl", |
| 44 'mojo_gles2_for_component': "mojo_gles2_impl", |
| 45 'mojo_gles2_for_loadable_module': "mojo_gles2_impl", |
| 44 }, { | 46 }, { |
| 45 'mojo_system_for_component': "mojo_none", | 47 'mojo_system_for_component': "mojo_none", |
| 46 'mojo_system_for_loadable_module': "mojo_system", | 48 'mojo_system_for_loadable_module': "mojo_system", |
| 49 'mojo_gles2_for_component': "mojo_none", |
| 50 'mojo_gles2_for_loadable_module': "mojo_gles2", |
| 47 }], | 51 }], |
| 48 ], | 52 ], |
| 49 }, | 53 }, |
| 50 'includes': [ | 54 'includes': [ |
| 51 'mojo_apps.gypi', | 55 'mojo_apps.gypi', |
| 52 'mojo_examples.gypi', | 56 'mojo_examples.gypi', |
| 53 'mojo_public.gypi', | 57 'mojo_public.gypi', |
| 54 'mojo_public_tests.gypi', | 58 'mojo_public_tests.gypi', |
| 55 'mojo_services.gypi', | 59 'mojo_services.gypi', |
| 56 ], | 60 ], |
| (...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 331 { | 335 { |
| 332 'target_name': 'mojo_gles2_impl', | 336 'target_name': 'mojo_gles2_impl', |
| 333 'type': '<(component)', | 337 'type': '<(component)', |
| 334 'dependencies': [ | 338 'dependencies': [ |
| 335 '../base/base.gyp:base', | 339 '../base/base.gyp:base', |
| 336 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic
_annotations', | 340 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic
_annotations', |
| 337 '../gpu/gpu.gyp:command_buffer_client', | 341 '../gpu/gpu.gyp:command_buffer_client', |
| 338 '../gpu/gpu.gyp:command_buffer_common', | 342 '../gpu/gpu.gyp:command_buffer_common', |
| 339 '../gpu/gpu.gyp:gles2_cmd_helper', | 343 '../gpu/gpu.gyp:gles2_cmd_helper', |
| 340 '../gpu/gpu.gyp:gles2_implementation', | 344 '../gpu/gpu.gyp:gles2_implementation', |
| 341 'mojo_gles2', | |
| 342 'mojo_gles2_bindings', | 345 'mojo_gles2_bindings', |
| 343 'mojo_environment_chromium', | 346 'mojo_environment_chromium', |
| 344 '<(mojo_system_for_component)', | 347 '<(mojo_system_for_component)', |
| 345 ], | 348 ], |
| 346 'defines': [ | 349 'defines': [ |
| 347 'MOJO_GLES2_IMPL_IMPLEMENTATION', | 350 'MOJO_GLES2_IMPL_IMPLEMENTATION', |
| 351 'MOJO_GLES2_IMPLEMENTATION', |
| 352 'GLES2_USE_MOJO', |
| 353 'MOJO_USE_GLES2_IMPL' |
| 348 ], | 354 ], |
| 355 'direct_dependent_settings': { |
| 356 # 'include_dirs': [ |
| 357 # '..', |
| 358 # ], |
| 359 'defines': [ |
| 360 'GLES2_USE_MOJO', |
| 361 ], |
| 362 }, |
| 349 'sources': [ | 363 'sources': [ |
| 350 'gles2/command_buffer_client_impl.cc', | 364 'gles2/command_buffer_client_impl.cc', |
| 351 'gles2/command_buffer_client_impl.h', | 365 'gles2/command_buffer_client_impl.h', |
| 352 'gles2/gles2_impl_export.h', | 366 'gles2/gles2_impl_export.h', |
| 353 'gles2/gles2_support_impl.cc', | 367 'gles2/gles2_impl.cc', |
| 354 'gles2/gles2_support_impl.h', | |
| 355 'gles2/gles2_context.cc', | 368 'gles2/gles2_context.cc', |
| 356 'gles2/gles2_context.h', | 369 'gles2/gles2_context.h', |
| 357 ], | 370 ], |
| 371 'all_dependent_settings': { |
| 372 # Ensures that dependent projects import the core functions on Windows. |
| 373 'defines': ['MOJO_USE_GLES2_IMPL'], |
| 374 } |
| 358 }, | 375 }, |
| 359 { | 376 { |
| 360 'target_name': 'mojo_test_support_impl', | 377 'target_name': 'mojo_test_support_impl', |
| 361 'type': 'static_library', | 378 'type': 'static_library', |
| 362 'dependencies': [ | 379 'dependencies': [ |
| 363 '../base/base.gyp:base', | 380 '../base/base.gyp:base', |
| 364 ], | 381 ], |
| 365 'sources': [ | 382 'sources': [ |
| 366 'common/test/test_support_impl.cc', | 383 'common/test/test_support_impl.cc', |
| 367 'common/test/test_support_impl.h', | 384 'common/test/test_support_impl.h', |
| (...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 608 ], | 625 ], |
| 609 'sources': [ | 626 'sources': [ |
| 610 'shell/network_service_loader.cc', | 627 'shell/network_service_loader.cc', |
| 611 'shell/network_service_loader.h', | 628 'shell/network_service_loader.h', |
| 612 ], | 629 ], |
| 613 }], | 630 }], |
| 614 ['use_aura==1', { | 631 ['use_aura==1', { |
| 615 'dependencies': [ | 632 'dependencies': [ |
| 616 # These are only necessary as long as we hard code use of ViewManage
r. | 633 # These are only necessary as long as we hard code use of ViewManage
r. |
| 617 '../skia/skia.gyp:skia', | 634 '../skia/skia.gyp:skia', |
| 618 'mojo_gles2', | |
| 619 'mojo_view_manager', | 635 'mojo_view_manager', |
| 620 'mojo_view_manager_bindings', | 636 'mojo_view_manager_bindings', |
| 621 ], | 637 ], |
| 622 }, { # use_aura==0 | 638 }, { # use_aura==0 |
| 623 'sources!': [ | 639 'sources!': [ |
| 624 'shell/view_manager_loader.cc', | 640 'shell/view_manager_loader.cc', |
| 625 'shell/view_manager_loader.h', | 641 'shell/view_manager_loader.h', |
| 626 ], | 642 ], |
| 627 }], | 643 }], |
| 628 ], | 644 ], |
| (...skipping 419 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1048 'views/views_init_internal.h', | 1064 'views/views_init_internal.h', |
| 1049 ], | 1065 ], |
| 1050 'defines': [ | 1066 'defines': [ |
| 1051 'MOJO_VIEWS_IMPLEMENTATION', | 1067 'MOJO_VIEWS_IMPLEMENTATION', |
| 1052 ], | 1068 ], |
| 1053 }, | 1069 }, |
| 1054 ], | 1070 ], |
| 1055 }], | 1071 }], |
| 1056 ], | 1072 ], |
| 1057 } | 1073 } |
| OLD | NEW |