| OLD | NEW |
| 1 { | 1 { |
| 2 'targets': [ | 2 'targets': [ |
| 3 { | 3 { |
| 4 'target_name': 'mojo_system', | 4 'target_name': 'mojo_system', |
| 5 'type': '<(component)', | 5 'type': '<(component)', |
| 6 'defines': [ | 6 'defines': [ |
| 7 'MOJO_SYSTEM_IMPLEMENTATION', | 7 'MOJO_SYSTEM_IMPLEMENTATION', |
| 8 ], | 8 ], |
| 9 'include_dirs': [ | 9 'include_dirs': [ |
| 10 '..', | 10 '..', |
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 153 'public/cpp/bindings/tests/sample_service_unittest.cc', | 153 'public/cpp/bindings/tests/sample_service_unittest.cc', |
| 154 'public/cpp/bindings/tests/type_conversion_unittest.cc', | 154 'public/cpp/bindings/tests/type_conversion_unittest.cc', |
| 155 'public/interfaces/bindings/tests/math_calculator.mojom', | 155 'public/interfaces/bindings/tests/math_calculator.mojom', |
| 156 'public/interfaces/bindings/tests/sample_factory.mojom', | 156 'public/interfaces/bindings/tests/sample_factory.mojom', |
| 157 'public/interfaces/bindings/tests/sample_interfaces.mojom', | 157 'public/interfaces/bindings/tests/sample_interfaces.mojom', |
| 158 'public/interfaces/bindings/tests/test_structs.mojom', | 158 'public/interfaces/bindings/tests/test_structs.mojom', |
| 159 ], | 159 ], |
| 160 'variables': { | 160 'variables': { |
| 161 'mojom_base_output_dir': 'mojo', | 161 'mojom_base_output_dir': 'mojo', |
| 162 }, | 162 }, |
| 163 'includes': [ 'public/bindings/mojom_bindings_generator.gypi' ], | 163 'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ], |
| 164 }, | 164 }, |
| 165 { | 165 { |
| 166 'target_name': 'mojo_public_environment_unittests', | 166 'target_name': 'mojo_public_environment_unittests', |
| 167 'type': 'executable', | 167 'type': 'executable', |
| 168 'dependencies': [ | 168 'dependencies': [ |
| 169 '../base/base.gyp:base', | 169 '../base/base.gyp:base', |
| 170 '../testing/gtest.gyp:gtest', | 170 '../testing/gtest.gyp:gtest', |
| 171 'mojo_environment_standalone', | 171 'mojo_environment_standalone', |
| 172 'mojo_public_test_utils', | 172 'mojo_public_test_utils', |
| 173 'mojo_run_all_unittests', | 173 'mojo_run_all_unittests', |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 291 'target_name': 'mojo_sample_service', | 291 'target_name': 'mojo_sample_service', |
| 292 'type': 'static_library', | 292 'type': 'static_library', |
| 293 'sources': [ | 293 'sources': [ |
| 294 'public/interfaces/bindings/tests/sample_service.mojom', | 294 'public/interfaces/bindings/tests/sample_service.mojom', |
| 295 'public/interfaces/bindings/tests/sample_import.mojom', | 295 'public/interfaces/bindings/tests/sample_import.mojom', |
| 296 'public/interfaces/bindings/tests/sample_import2.mojom', | 296 'public/interfaces/bindings/tests/sample_import2.mojom', |
| 297 ], | 297 ], |
| 298 'variables': { | 298 'variables': { |
| 299 'mojom_base_output_dir': 'mojo', | 299 'mojom_base_output_dir': 'mojo', |
| 300 }, | 300 }, |
| 301 'includes': [ 'public/bindings/mojom_bindings_generator.gypi' ], | 301 'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ], |
| 302 'export_dependent_settings': [ | 302 'export_dependent_settings': [ |
| 303 'mojo_bindings', | 303 'mojo_bindings', |
| 304 'mojo_system', | 304 'mojo_system', |
| 305 ], | 305 ], |
| 306 'dependencies': [ | 306 'dependencies': [ |
| 307 'mojo_bindings', | 307 'mojo_bindings', |
| 308 'mojo_system', | 308 'mojo_system', |
| 309 ], | 309 ], |
| 310 }, | 310 }, |
| 311 { | 311 { |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 356 }, | 356 }, |
| 357 { | 357 { |
| 358 'target_name': 'mojo_shell_bindings', | 358 'target_name': 'mojo_shell_bindings', |
| 359 'type': 'static_library', | 359 'type': 'static_library', |
| 360 'sources': [ | 360 'sources': [ |
| 361 'public/interfaces/shell/shell.mojom', | 361 'public/interfaces/shell/shell.mojom', |
| 362 ], | 362 ], |
| 363 'variables': { | 363 'variables': { |
| 364 'mojom_base_output_dir': 'mojo', | 364 'mojom_base_output_dir': 'mojo', |
| 365 }, | 365 }, |
| 366 'includes': [ 'public/bindings/mojom_bindings_generator.gypi' ], | 366 'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ], |
| 367 'dependencies': [ | 367 'dependencies': [ |
| 368 'mojo_bindings', | 368 'mojo_bindings', |
| 369 'mojo_system', | 369 'mojo_system', |
| 370 ], | 370 ], |
| 371 'export_dependent_settings': [ | 371 'export_dependent_settings': [ |
| 372 'mojo_bindings', | 372 'mojo_bindings', |
| 373 ], | 373 ], |
| 374 }, | 374 }, |
| 375 { | 375 { |
| 376 'target_name': 'mojo_shell_client', | 376 'target_name': 'mojo_shell_client', |
| 377 'type': 'static_library', | 377 'type': 'static_library', |
| 378 'sources': [ | 378 'sources': [ |
| 379 'public/cpp/shell/application.h', | 379 'public/cpp/shell/application.h', |
| 380 'public/cpp/shell/service.h', | 380 'public/cpp/shell/service.h', |
| 381 'public/cpp/shell/lib/application.cc', | 381 'public/cpp/shell/lib/application.cc', |
| 382 'public/cpp/shell/lib/service.cc', | 382 'public/cpp/shell/lib/service.cc', |
| 383 ], | 383 ], |
| 384 'dependencies': [ | 384 'dependencies': [ |
| 385 'mojo_shell_bindings', | 385 'mojo_shell_bindings', |
| 386 ], | 386 ], |
| 387 'export_dependent_settings': [ | 387 'export_dependent_settings': [ |
| 388 'mojo_shell_bindings', | 388 'mojo_shell_bindings', |
| 389 ], | 389 ], |
| 390 }, | 390 }, |
| 391 ], | 391 ], |
| 392 } | 392 } |
| OLD | NEW |