Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(300)

Side by Side Diff: ash/ash.gyp

Issue 10700163: Rename aura_shell_unittests to ash_unittests, part 1 (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: rebase, fix typo Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | build/all.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 ], 345 ],
346 }], 346 }],
347 ['chromeos==1', { 347 ['chromeos==1', {
348 'dependencies': [ 348 'dependencies': [
349 '../chromeos/chromeos.gyp:chromeos', 349 '../chromeos/chromeos.gyp:chromeos',
350 ], 350 ],
351 }], 351 }],
352 ], 352 ],
353 }, 353 },
354 { 354 {
355 'target_name': 'aura_shell_unittests', 355 'target_name': 'ash_unittests',
356 'type': 'executable', 356 'type': 'executable',
357 'dependencies': [ 357 'dependencies': [
358 '../base/base.gyp:base', 358 '../base/base.gyp:base',
359 '../base/base.gyp:test_support_base', 359 '../base/base.gyp:test_support_base',
360 '../chrome/chrome_resources.gyp:packed_resources', 360 '../chrome/chrome_resources.gyp:packed_resources',
361 '../content/content.gyp:content_browser', 361 '../content/content.gyp:content_browser',
362 '../content/content.gyp:test_support_content', 362 '../content/content.gyp:test_support_content',
363 '../build/temp_gyp/googleurl.gyp:googleurl', 363 '../build/temp_gyp/googleurl.gyp:googleurl',
364 '../skia/skia.gyp:skia', 364 '../skia/skia.gyp:skia',
365 '../testing/gtest.gyp:gtest', 365 '../testing/gtest.gyp:gtest',
(...skipping 19 matching lines...) Expand all
385 'accelerators/nested_dispatcher_controller_unittest.cc', 385 'accelerators/nested_dispatcher_controller_unittest.cc',
386 'dip_unittest.cc', 386 'dip_unittest.cc',
387 'display/display_controller_unittest.cc', 387 'display/display_controller_unittest.cc',
388 'display/multi_display_manager_unittest.cc', 388 'display/multi_display_manager_unittest.cc',
389 'drag_drop/drag_drop_controller_unittest.cc', 389 'drag_drop/drag_drop_controller_unittest.cc',
390 'extended_desktop_unittest.cc', 390 'extended_desktop_unittest.cc',
391 'focus_cycler_unittest.cc', 391 'focus_cycler_unittest.cc',
392 'launcher/launcher_context_menu_unittest.cc', 392 'launcher/launcher_context_menu_unittest.cc',
393 'launcher/launcher_model_unittest.cc', 393 'launcher/launcher_model_unittest.cc',
394 'launcher/launcher_navigator_unittest.cc', 394 'launcher/launcher_navigator_unittest.cc',
395 » 'launcher/launcher_tooltip_manager_unittest.cc', 395 'launcher/launcher_tooltip_manager_unittest.cc',
396 'launcher/launcher_unittest.cc', 396 'launcher/launcher_unittest.cc',
397 'launcher/launcher_view_unittest.cc', 397 'launcher/launcher_view_unittest.cc',
398 'root_window_controller_unittest.cc', 398 'root_window_controller_unittest.cc',
399 'screensaver/screensaver_view_unittest.cc', 399 'screensaver/screensaver_view_unittest.cc',
400 'shell_unittest.cc', 400 'shell_unittest.cc',
401 'system/tray/system_tray_unittest.cc', 401 'system/tray/system_tray_unittest.cc',
402 'system/web_notification/web_notification_tray_unittest.cc', 402 'system/web_notification/web_notification_tray_unittest.cc',
403 'test/ash_test_base.cc', 403 'test/ash_test_base.cc',
404 'test/ash_test_base.h', 404 'test/ash_test_base.h',
405 'test/ash_unittests.cc', 405 'test/ash_unittests.cc',
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
459 ['OS=="win"', { 459 ['OS=="win"', {
460 # TODO(zork): fix this test to build on Windows. See: crosbug.com/2690 6 460 # TODO(zork): fix this test to build on Windows. See: crosbug.com/2690 6
461 'sources/': [ 461 'sources/': [
462 ['exclude', 'focus_cycler_unittest.cc'], 462 ['exclude', 'focus_cycler_unittest.cc'],
463 ], 463 ],
464 }], 464 }],
465 ['OS=="mac"', { 465 ['OS=="mac"', {
466 'sources/': [ 466 'sources/': [
467 ['exclude', 'accelerators/accelerator_controller_unittest.cc'], 467 ['exclude', 'accelerators/accelerator_controller_unittest.cc'],
468 ['exclude', 'accelerators/accelerator_filter_unittest.cc'], 468 ['exclude', 'accelerators/accelerator_filter_unittest.cc'],
469 » ['exclude', 'accelerators/nested_dispatcher_controller_unittest.cc'] , 469 ['exclude', 'accelerators/nested_dispatcher_controller_unittest.cc'] ,
470 ['exclude', 'drag_drop/drag_drop_controller_unittest.cc'], 470 ['exclude', 'drag_drop/drag_drop_controller_unittest.cc'],
471 ['exclude', 'tooltips/tooltip_controller_unittest.cc'], 471 ['exclude', 'tooltips/tooltip_controller_unittest.cc'],
472 ], 472 ],
473 'dependencies': [ 473 'dependencies': [
474 # Mac tests access resources via the 'AuraShell.app' directory. 474 # Mac tests access resources via the 'AuraShell.app' directory.
475 'ash_shell', 475 'ash_shell',
476 ], 476 ],
477 # Special linker instructions that avoids stripping Obj-C classes that 477 # Special linker instructions that avoids stripping Obj-C classes that
478 # are not referenced in code, but are referenced in nibs. 478 # are not referenced in code, but are referenced in nibs.
479 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, 479 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
480 }], 480 }],
481 ], 481 ],
482 }, 482 },
483 # ash_unittests was formerly named aura_shell_unittests. While the build
484 # bots are being switched to use the new name we need to support both
485 # executables.
486 # TODO(jamescook): Remove this section when build bots are building and
487 # running ash_unittests.
488 {
489 'target_name': 'aura_shell_unittests',
490 'type': 'none',
491 'dependencies': [
492 'ash_unittests',
493 ],
494 'actions': [
495 {
496 'message': 'TEMPORARY: Copy ash_unittests to aura_shell_unittests',
497 'action_name': 'copy_ash_unittests',
498 'variables': {
499 'source_file': '<(PRODUCT_DIR)/ash_unittests<(EXECUTABLE_SUFFIX)',
500 'dest_file': '<(PRODUCT_DIR)/aura_shell_unittests<(EXECUTABLE_SUFFIX )',
501 },
502 'inputs': [
503 '<(DEPTH)/build/cp.py',
504 '<(source_file)',
505 ],
506 'outputs': [
507 '<(dest_file)',
508 ],
509 'action': [
510 'python', '<(DEPTH)/build/cp.py', '<(source_file)', '<(dest_file)',
511 ],
512 },
513 ],
514 },
483 { 515 {
484 'target_name': 'ash_shell', 516 'target_name': 'ash_shell',
485 'type': 'executable', 517 'type': 'executable',
486 'dependencies': [ 518 'dependencies': [
487 '../base/base.gyp:base', 519 '../base/base.gyp:base',
488 '../base/base.gyp:base_i18n', 520 '../base/base.gyp:base_i18n',
489 '../chrome/chrome_resources.gyp:packed_resources', 521 '../chrome/chrome_resources.gyp:packed_resources',
490 '../content/content.gyp:content_shell_lib', 522 '../content/content.gyp:content_shell_lib',
491 '../content/content.gyp:content', 523 '../content/content.gyp:content',
492 '../skia/skia.gyp:skia', 524 '../skia/skia.gyp:skia',
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
564 'shell/cocoa/app-Info.plist', 596 'shell/cocoa/app-Info.plist',
565 ], 597 ],
566 'xcode_settings': { 598 'xcode_settings': {
567 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist', 599 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist',
568 }, 600 },
569 }], 601 }],
570 ], 602 ],
571 }, 603 },
572 ], 604 ],
573 } 605 }
OLDNEW
« no previous file with comments | « no previous file | build/all.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698