| OLD | NEW |
| 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2011 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 'targets': [ | 6 'targets': [ |
| 7 { | 7 { |
| 8 'target_name': 'All', | 8 'target_name': 'All', |
| 9 'type': 'none', | 9 'type': 'none', |
| 10 'xcode_create_dependents_test_runner': 1, | 10 'xcode_create_dependents_test_runner': 1, |
| (...skipping 588 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 599 }, | 599 }, |
| 600 ], # targets | 600 ], # targets |
| 601 }], # "chromeos==1" | 601 }], # "chromeos==1" |
| 602 ['use_aura==1', { | 602 ['use_aura==1', { |
| 603 'targets': [ | 603 'targets': [ |
| 604 { | 604 { |
| 605 'target_name': 'aura_builder', | 605 'target_name': 'aura_builder', |
| 606 'type': 'none', | 606 'type': 'none', |
| 607 'dependencies': [ | 607 'dependencies': [ |
| 608 '../chrome/chrome.gyp:chrome', | 608 '../chrome/chrome.gyp:chrome', |
| 609 '../chrome/chrome.gyp:unit_tests', |
| 609 '../ui/aura_shell/aura_shell.gyp:aura_shell_exe', | 610 '../ui/aura_shell/aura_shell.gyp:aura_shell_exe', |
| 610 '../ui/aura_shell/aura_shell.gyp:aura_shell_unittests', | 611 '../ui/aura_shell/aura_shell.gyp:aura_shell_unittests', |
| 611 '../ui/aura/aura.gyp:*', | 612 '../ui/aura/aura.gyp:*', |
| 612 '../ui/gfx/compositor/compositor.gyp:*', | 613 '../ui/gfx/compositor/compositor.gyp:*', |
| 613 '../views/views.gyp:views', | 614 '../views/views.gyp:views', |
| 614 '../views/views.gyp:views_unittests', | 615 '../views/views.gyp:views_unittests', |
| 615 '../webkit/webkit.gyp:pull_in_webkit_unit_tests', | 616 '../webkit/webkit.gyp:pull_in_webkit_unit_tests', |
| 616 ], | 617 ], |
| 617 'conditions': [ | 618 'conditions': [ |
| 618 ['OS=="win"', { | 619 ['OS=="win"', { |
| 619 # Remove this when we have the real compositor. | 620 # Remove this when we have the real compositor. |
| 620 'copies': [ | 621 'copies': [ |
| 621 { | 622 { |
| 622 'destination': '<(PRODUCT_DIR)', | 623 'destination': '<(PRODUCT_DIR)', |
| 623 'files': ['../third_party/directxsdk/files/dlls/D3DX10d_43.dll
'] | 624 'files': ['../third_party/directxsdk/files/dlls/D3DX10d_43.dll
'] |
| 624 }, | 625 }, |
| 625 ], | 626 ], |
| 626 'dependencies': [ | 627 'dependencies': [ |
| 627 '../chrome/chrome.gyp:crash_service', | 628 '../chrome/chrome.gyp:crash_service', |
| 628 '../chrome/chrome.gyp:crash_service_win64', | 629 '../chrome/chrome.gyp:crash_service_win64', |
| 629 ], | 630 ], |
| 630 }], | 631 }], |
| 631 ['OS=="linux"', { | 632 ['OS=="linux"', { |
| 632 # Aura unit_tests currently only work on Linux. | 633 # Tests that currently only work on Linux. |
| 633 'dependencies': [ | 634 'dependencies': [ |
| 634 '../chrome/chrome.gyp:sync_unit_tests', | 635 '../chrome/chrome.gyp:sync_unit_tests', |
| 635 '../chrome/chrome.gyp:unit_tests', | |
| 636 '../content/content.gyp:content_unittests', | 636 '../content/content.gyp:content_unittests', |
| 637 '../ipc/ipc.gyp:ipc_tests', | 637 '../ipc/ipc.gyp:ipc_tests', |
| 638 '../sql/sql.gyp:sql_unittests', | 638 '../sql/sql.gyp:sql_unittests', |
| 639 '../ui/ui.gyp:gfx_unittests', | 639 '../ui/ui.gyp:gfx_unittests', |
| 640 ], | 640 ], |
| 641 }], | 641 }], |
| 642 ], | 642 ], |
| 643 }, | 643 }, |
| 644 ], # targets | 644 ], # targets |
| 645 }], # "use_aura==1" | 645 }], # "use_aura==1" |
| 646 ], # conditions | 646 ], # conditions |
| 647 } | 647 } |
| OLD | NEW |