OLD | NEW |
---|---|
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 'variables': { | 6 'variables': { |
7 'chromium_code': 1, | 7 'chromium_code': 1, |
8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', | 8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', |
9 }, | 9 }, |
10 | 10 |
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
346 ], | 346 ], |
347 }], | 347 }], |
348 ['chromeos==1', { | 348 ['chromeos==1', { |
349 'dependencies': [ | 349 'dependencies': [ |
350 '../chromeos/chromeos.gyp:chromeos', | 350 '../chromeos/chromeos.gyp:chromeos', |
351 ], | 351 ], |
352 }], | 352 }], |
353 ], | 353 ], |
354 }, | 354 }, |
355 { | 355 { |
356 'target_name': 'aura_shell_unittests', | 356 'target_name': 'ash_unittests', |
357 'type': 'executable', | 357 'type': 'executable', |
358 'dependencies': [ | 358 'dependencies': [ |
359 '../base/base.gyp:base', | 359 '../base/base.gyp:base', |
360 '../base/base.gyp:test_support_base', | 360 '../base/base.gyp:test_support_base', |
361 '../chrome/chrome_resources.gyp:packed_resources', | 361 '../chrome/chrome_resources.gyp:packed_resources', |
362 '../content/content.gyp:content_browser', | 362 '../content/content.gyp:content_browser', |
363 '../content/content.gyp:test_support_content', | 363 '../content/content.gyp:test_support_content', |
364 '../build/temp_gyp/googleurl.gyp:googleurl', | 364 '../build/temp_gyp/googleurl.gyp:googleurl', |
365 '../skia/skia.gyp:skia', | 365 '../skia/skia.gyp:skia', |
366 '../testing/gtest.gyp:gtest', | 366 '../testing/gtest.gyp:gtest', |
(...skipping 20 matching lines...) Expand all Loading... | |
387 'accelerators/nested_dispatcher_controller_unittest.cc', | 387 'accelerators/nested_dispatcher_controller_unittest.cc', |
388 'dip_unittest.cc', | 388 'dip_unittest.cc', |
389 'display/display_controller_unittest.cc', | 389 'display/display_controller_unittest.cc', |
390 'display/multi_display_manager_unittest.cc', | 390 'display/multi_display_manager_unittest.cc', |
391 'drag_drop/drag_drop_controller_unittest.cc', | 391 'drag_drop/drag_drop_controller_unittest.cc', |
392 'extended_desktop_unittest.cc', | 392 'extended_desktop_unittest.cc', |
393 'focus_cycler_unittest.cc', | 393 'focus_cycler_unittest.cc', |
394 'launcher/launcher_context_menu_unittest.cc', | 394 'launcher/launcher_context_menu_unittest.cc', |
395 'launcher/launcher_model_unittest.cc', | 395 'launcher/launcher_model_unittest.cc', |
396 'launcher/launcher_navigator_unittest.cc', | 396 'launcher/launcher_navigator_unittest.cc', |
397 » 'launcher/launcher_tooltip_manager_unittest.cc', | 397 » 'launcher/launcher_tooltip_manager_unittest.cc', |
Greg Spencer (Chromium)
2012/07/12 19:58:54
Looks like some tab characters snuck in here.
James Cook
2012/07/12 20:53:11
Done.
| |
398 'launcher/launcher_unittest.cc', | 398 'launcher/launcher_unittest.cc', |
399 'launcher/launcher_view_unittest.cc', | 399 'launcher/launcher_view_unittest.cc', |
400 'root_window_controller_unittest.cc', | 400 'root_window_controller_unittest.cc', |
401 'screensaver/screensaver_view_unittest.cc', | 401 'screensaver/screensaver_view_unittest.cc', |
402 'shell_unittest.cc', | 402 'shell_unittest.cc', |
403 'system/tray/system_tray_unittest.cc', | 403 'system/tray/system_tray_unittest.cc', |
404 'system/web_notification/web_notification_tray_unittest.cc', | 404 'system/web_notification/web_notification_tray_unittest.cc', |
405 'test/ash_test_base.cc', | 405 'test/ash_test_base.cc', |
406 'test/ash_test_base.h', | 406 'test/ash_test_base.h', |
407 'test/ash_unittests.cc', | 407 'test/ash_unittests.cc', |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
462 ['OS=="win"', { | 462 ['OS=="win"', { |
463 # TODO(zork): fix this test to build on Windows. See: crosbug.com/2690 6 | 463 # TODO(zork): fix this test to build on Windows. See: crosbug.com/2690 6 |
464 'sources/': [ | 464 'sources/': [ |
465 ['exclude', 'focus_cycler_unittest.cc'], | 465 ['exclude', 'focus_cycler_unittest.cc'], |
466 ], | 466 ], |
467 }], | 467 }], |
468 ['OS=="mac"', { | 468 ['OS=="mac"', { |
469 'sources/': [ | 469 'sources/': [ |
470 ['exclude', 'accelerators/accelerator_controller_unittest.cc'], | 470 ['exclude', 'accelerators/accelerator_controller_unittest.cc'], |
471 ['exclude', 'accelerators/accelerator_filter_unittest.cc'], | 471 ['exclude', 'accelerators/accelerator_filter_unittest.cc'], |
472 » ['exclude', 'accelerators/nested_dispatcher_controller_unittest.cc'] , | 472 » ['exclude', 'accelerators/nested_dispatcher_controller_unittes t.cc'], |
Greg Spencer (Chromium)
2012/07/12 19:58:54
Same here (tabs).
James Cook
2012/07/12 20:53:11
Done.
| |
473 ['exclude', 'drag_drop/drag_drop_controller_unittest.cc'], | 473 ['exclude', 'drag_drop/drag_drop_controller_unittest.cc'], |
474 ['exclude', 'tooltips/tooltip_controller_unittest.cc'], | 474 ['exclude', 'tooltips/tooltip_controller_unittest.cc'], |
475 ], | 475 ], |
476 'dependencies': [ | 476 'dependencies': [ |
477 # Mac tests access resources via the 'AuraShell.app' directory. | 477 # Mac tests access resources via the 'AuraShell.app' directory. |
478 'ash_shell', | 478 'ash_shell', |
479 ], | 479 ], |
480 # Special linker instructions that avoids stripping Obj-C classes that | 480 # Special linker instructions that avoids stripping Obj-C classes that |
481 # are not referenced in code, but are referenced in nibs. | 481 # are not referenced in code, but are referenced in nibs. |
482 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, | 482 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, |
483 }], | 483 }], |
484 ], | 484 ], |
485 }, | 485 }, |
486 # ash_unittests was formerly named aura_shell_unittests. While the build | |
487 # bots are being switched to use the new name we need to support both | |
488 # executables. | |
489 # TODO(jamescook): Remove this section when build bots are building and | |
490 # running ash_unittests. | |
491 { | |
492 'target_name': 'aura_shell_unittests', | |
493 'type': 'none', | |
494 'dependencies': [ | |
495 'ash_unittests', | |
496 ], | |
497 'actions': [ | |
498 { | |
499 'message': 'TEMPORARY: Copy ash_unittests to aura_shell_unittests', | |
500 'action_name': 'copy_ash_unittests', | |
501 'variables': { | |
502 'source_file': '<(PRODUCT_DIR)/ash_unittests<(EXECUTABLE_SUFFIX)', | |
503 'dest_file': '<(PRODUCT_DIR)/aura_shell_unittests<(EXECUTABLE_SUFFIX )', | |
504 }, | |
505 'inputs': [ | |
506 '<(DEPTH)/build/cp.py', | |
507 '<(source_file)', | |
508 ], | |
509 'outputs': [ | |
510 '<(dest_file)', | |
511 ], | |
512 'action': [ | |
513 'python', '<(DEPTH)/build/cp.py', '<(source_file)', '<(dest_file)', | |
514 ], | |
515 }, | |
516 ], | |
517 }, | |
486 { | 518 { |
487 'target_name': 'ash_shell', | 519 'target_name': 'ash_shell', |
488 'type': 'executable', | 520 'type': 'executable', |
489 'dependencies': [ | 521 'dependencies': [ |
490 '../base/base.gyp:base', | 522 '../base/base.gyp:base', |
491 '../base/base.gyp:base_i18n', | 523 '../base/base.gyp:base_i18n', |
492 '../chrome/chrome_resources.gyp:packed_resources', | 524 '../chrome/chrome_resources.gyp:packed_resources', |
493 '../content/content.gyp:content_shell_lib', | 525 '../content/content.gyp:content_shell_lib', |
494 '../content/content.gyp:content', | 526 '../content/content.gyp:content', |
495 '../skia/skia.gyp:skia', | 527 '../skia/skia.gyp:skia', |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
569 'shell/cocoa/app-Info.plist', | 601 'shell/cocoa/app-Info.plist', |
570 ], | 602 ], |
571 'xcode_settings': { | 603 'xcode_settings': { |
572 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist', | 604 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist', |
573 }, | 605 }, |
574 }], | 606 }], |
575 ], | 607 ], |
576 }, | 608 }, |
577 ], | 609 ], |
578 } | 610 } |
OLD | NEW |