| 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 360 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 371     }, | 371     }, | 
| 372     { | 372     { | 
| 373       'target_name': 'mojo_environment_chromium', | 373       'target_name': 'mojo_environment_chromium', | 
| 374       'type': 'static_library', | 374       'type': 'static_library', | 
| 375       'dependencies': [ | 375       'dependencies': [ | 
| 376         'mojo_common_lib', | 376         'mojo_common_lib', | 
| 377         'mojo_environment_chromium_impl', | 377         'mojo_environment_chromium_impl', | 
| 378       ], | 378       ], | 
| 379       'sources': [ | 379       'sources': [ | 
| 380         'environment/default_async_waiter.cc', | 380         'environment/default_async_waiter.cc', | 
| 381         'environment/buffer_tls.cc', |  | 
| 382         'environment/environment.cc', | 381         'environment/environment.cc', | 
| 383       ], | 382       ], | 
| 384       'include_dirs': [ | 383       'include_dirs': [ | 
| 385         '..', | 384         '..', | 
| 386       ], | 385       ], | 
| 387       'export_dependent_settings': [ | 386       'export_dependent_settings': [ | 
| 388         'mojo_environment_chromium_impl', | 387         'mojo_environment_chromium_impl', | 
| 389       ], | 388       ], | 
| 390     }, | 389     }, | 
| 391     { | 390     { | 
| 392       'target_name': 'mojo_environment_chromium_impl', | 391       'target_name': 'mojo_environment_chromium_impl', | 
| 393       'type': '<(component)', | 392       'type': '<(component)', | 
| 394       'defines': [ | 393       'defines': [ | 
| 395         'MOJO_ENVIRONMENT_IMPL_IMPLEMENTATION', | 394         'MOJO_ENVIRONMENT_IMPL_IMPLEMENTATION', | 
| 396       ], | 395       ], | 
| 397       'dependencies': [ | 396       'dependencies': [ | 
| 398         '../base/base.gyp:base', | 397         '../base/base.gyp:base', | 
| 399         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic
     _annotations', | 398         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic
     _annotations', | 
| 400         'mojo_common_lib' | 399         'mojo_common_lib' | 
| 401       ], | 400       ], | 
| 402       'sources': [ | 401       'sources': [ | 
| 403         'environment/default_async_waiter_impl.cc', | 402         'environment/default_async_waiter_impl.cc', | 
| 404         'environment/default_async_waiter_impl.h', | 403         'environment/default_async_waiter_impl.h', | 
| 405         'environment/buffer_tls_impl.cc', |  | 
| 406         'environment/buffer_tls_impl.h', |  | 
| 407       ], | 404       ], | 
| 408       'include_dirs': [ | 405       'include_dirs': [ | 
| 409         '..', | 406         '..', | 
| 410       ], | 407       ], | 
| 411     }, | 408     }, | 
| 412     { | 409     { | 
| 413       'target_name': 'mojo_service_manager', | 410       'target_name': 'mojo_service_manager', | 
| 414       'type': '<(component)', | 411       'type': '<(component)', | 
| 415       'defines': [ | 412       'defines': [ | 
| 416         'MOJO_SERVICE_MANAGER_IMPLEMENTATION', | 413         'MOJO_SERVICE_MANAGER_IMPLEMENTATION', | 
| (...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 900             'aura/screen_mojo.cc', | 897             'aura/screen_mojo.cc', | 
| 901             'aura/screen_mojo.h', | 898             'aura/screen_mojo.h', | 
| 902             'aura/window_tree_host_mojo.cc', | 899             'aura/window_tree_host_mojo.cc', | 
| 903             'aura/window_tree_host_mojo.h', | 900             'aura/window_tree_host_mojo.h', | 
| 904           ], | 901           ], | 
| 905         }, | 902         }, | 
| 906       ], | 903       ], | 
| 907     }], | 904     }], | 
| 908   ], | 905   ], | 
| 909 } | 906 } | 
| OLD | NEW | 
|---|