| OLD | NEW |
|---|
| 1 { | 1 { |
| 2 'targets': [ | 2 'targets': [ |
| 3 { | 3 { |
| 4 'target_name': 'mojo_system', | 4 'target_name': 'mojo_system', |
| 5 'type': 'static_library', | 5 'type': 'static_library', |
| 6 'defines': [ | 6 'defines': [ |
| 7 'MOJO_SYSTEM_IMPLEMENTATION', | 7 'MOJO_SYSTEM_IMPLEMENTATION', |
| 8 ], | 8 ], |
| 9 'include_dirs': [ | 9 'include_dirs': [ |
| 10 '..', | 10 '..', |
| (...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 375 'public/cpp/application/lib/service_connector.cc', | 375 'public/cpp/application/lib/service_connector.cc', |
| 376 'public/cpp/application/lib/service_connector.h', | 376 'public/cpp/application/lib/service_connector.h', |
| 377 ], | 377 ], |
| 378 'dependencies': [ | 378 'dependencies': [ |
| 379 'mojo_service_provider_bindings', | 379 'mojo_service_provider_bindings', |
| 380 ], | 380 ], |
| 381 'export_dependent_settings': [ | 381 'export_dependent_settings': [ |
| 382 'mojo_service_provider_bindings', | 382 'mojo_service_provider_bindings', |
| 383 ], | 383 ], |
| 384 }, | 384 }, |
| 385 { | |
| 386 'target_name': 'mojo_main_standalone', | |
| 387 'type': 'static_library', | |
| 388 'sources': [ | |
| 389 'public/cpp/application/lib/mojo_main_standalone.cc', | |
| 390 ], | |
| 391 'dependencies': [ | |
| 392 'mojo_application', | |
| 393 ], | |
| 394 'export_dependent_settings': [ | |
| 395 'mojo_application', | |
| 396 ], | |
| 397 }, | |
| 398 { | |
| 399 'target_name': 'mojo_main_chromium', | |
| 400 'type': 'static_library', | |
| 401 'sources': [ | |
| 402 'public/cpp/application/lib/mojo_main_chromium.cc', | |
| 403 ], | |
| 404 'dependencies': [ | |
| 405 'mojo_application', | |
| 406 ], | |
| 407 'export_dependent_settings': [ | |
| 408 'mojo_application', | |
| 409 ], | |
| 410 }, | |
| 411 ], | 385 ], |
| 412 'conditions': [ | 386 'conditions': [ |
| 413 ['OS == "android"', { | 387 ['OS == "android"', { |
| 414 'targets': [ | 388 'targets': [ |
| 415 { | 389 { |
| 416 'target_name': 'mojo_public_java', | 390 'target_name': 'mojo_public_java', |
| 417 'type': 'none', | 391 'type': 'none', |
| 418 'variables': { | 392 'variables': { |
| 419 'java_in_dir': 'public/java', | 393 'java_in_dir': 'public/java', |
| 420 }, | 394 }, |
| 421 'includes': [ '../build/java.gypi' ], | 395 'includes': [ '../build/java.gypi' ], |
| 422 }, | 396 }, |
| 423 { | 397 { |
| 424 'target_name': 'mojo_bindings_java', | 398 'target_name': 'mojo_bindings_java', |
| 425 'type': 'none', | 399 'type': 'none', |
| 426 'variables': { | 400 'variables': { |
| 427 'java_in_dir': 'bindings/java', | 401 'java_in_dir': 'bindings/java', |
| 428 }, | 402 }, |
| 429 'dependencies': [ | 403 'dependencies': [ |
| 430 'mojo_public_java', | 404 'mojo_public_java', |
| 431 ], | 405 ], |
| 432 'includes': [ '../build/java.gypi' ], | 406 'includes': [ '../build/java.gypi' ], |
| 433 }, | 407 }, |
| 434 ], | 408 ], |
| 435 }], | 409 }], |
| 436 ], | 410 ], |
| 437 } | 411 } |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 316223002:
Include mojo_main_{chromium,standalone}.cc instead of using a target (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src