| 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 488 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 499 'dependencies': [ | 499 'dependencies': [ |
| 500 # Mac tests access resources via the 'AuraShell.app' directory. | 500 # Mac tests access resources via the 'AuraShell.app' directory. |
| 501 'ash_shell', | 501 'ash_shell', |
| 502 ], | 502 ], |
| 503 # Special linker instructions that avoids stripping Obj-C classes that | 503 # Special linker instructions that avoids stripping Obj-C classes that |
| 504 # are not referenced in code, but are referenced in nibs. | 504 # are not referenced in code, but are referenced in nibs. |
| 505 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, | 505 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, |
| 506 }], | 506 }], |
| 507 ], | 507 ], |
| 508 }, | 508 }, |
| 509 # ash_unittests was formerly named aura_shell_unittests. While the build | |
| 510 # bots are being switched to use the new name we need to support both | |
| 511 # executables. | |
| 512 # TODO(jamescook): Remove this section when build bots are building and | |
| 513 # running ash_unittests. | |
| 514 { | |
| 515 'target_name': 'aura_shell_unittests', | |
| 516 'type': 'none', | |
| 517 'dependencies': [ | |
| 518 'ash_unittests', | |
| 519 ], | |
| 520 'actions': [ | |
| 521 { | |
| 522 'message': 'TEMPORARY: Copy ash_unittests to aura_shell_unittests', | |
| 523 'action_name': 'copy_ash_unittests', | |
| 524 'variables': { | |
| 525 'source_file': '<(PRODUCT_DIR)/ash_unittests<(EXECUTABLE_SUFFIX)', | |
| 526 'dest_file': '<(PRODUCT_DIR)/aura_shell_unittests<(EXECUTABLE_SUFFIX
)', | |
| 527 }, | |
| 528 'inputs': [ | |
| 529 '<(DEPTH)/build/cp.py', | |
| 530 '<(source_file)', | |
| 531 ], | |
| 532 'outputs': [ | |
| 533 '<(dest_file)', | |
| 534 ], | |
| 535 'action': [ | |
| 536 'python', '<(DEPTH)/build/cp.py', '<(source_file)', '<(dest_file)', | |
| 537 ], | |
| 538 }, | |
| 539 ], | |
| 540 }, | |
| 541 { | 509 { |
| 542 'target_name': 'ash_shell', | 510 'target_name': 'ash_shell', |
| 543 'type': 'executable', | 511 'type': 'executable', |
| 544 'dependencies': [ | 512 'dependencies': [ |
| 545 '../base/base.gyp:base', | 513 '../base/base.gyp:base', |
| 546 '../base/base.gyp:base_i18n', | 514 '../base/base.gyp:base_i18n', |
| 547 '../chrome/chrome_resources.gyp:packed_resources', | 515 '../chrome/chrome_resources.gyp:packed_resources', |
| 548 '../content/content.gyp:content_shell_lib', | 516 '../content/content.gyp:content_shell_lib', |
| 549 '../content/content.gyp:content', | 517 '../content/content.gyp:content', |
| 550 '../skia/skia.gyp:skia', | 518 '../skia/skia.gyp:skia', |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 621 'shell/cocoa/app-Info.plist', | 589 'shell/cocoa/app-Info.plist', |
| 622 ], | 590 ], |
| 623 'xcode_settings': { | 591 'xcode_settings': { |
| 624 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist', | 592 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist', |
| 625 }, | 593 }, |
| 626 }], | 594 }], |
| 627 ], | 595 ], |
| 628 }, | 596 }, |
| 629 ], | 597 ], |
| 630 } | 598 } |
| OLD | NEW |