| 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 'nacl_win64_target': 0, | 7 'nacl_win64_target': 0, |
| 8 }, | 8 }, |
| 9 'includes': [ | 9 'includes': [ |
| 10 'gpu_common.gypi', | 10 'gpu_common.gypi', |
| (...skipping 688 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 699 'dependencies': [ | 699 'dependencies': [ |
| 700 'gpu_perftests', | 700 'gpu_perftests', |
| 701 ], | 701 ], |
| 702 'variables': { | 702 'variables': { |
| 703 'test_suite_name': 'gpu_perftests', | 703 'test_suite_name': 'gpu_perftests', |
| 704 }, | 704 }, |
| 705 'includes': [ '../build/apk_test.gypi' ], | 705 'includes': [ '../build/apk_test.gypi' ], |
| 706 }, | 706 }, |
| 707 ], | 707 ], |
| 708 }], | 708 }], |
| 709 ['OS == "win"', { | 709 ['OS == "win" or (OS == "linux" and use_x11)', { |
| 710 'targets': [ | 710 'targets': [ |
| 711 { | 711 { |
| 712 # TODO(kbr): port this target to the GN build. | 712 # TODO(kbr): port this target to the GN build. |
| 713 'target_name': 'angle_end2end_tests', | 713 'target_name': 'angle_end2end_tests', |
| 714 'type': '<(gtest_target_type)', | 714 'type': '<(gtest_target_type)', |
| 715 'dependencies': [ | 715 'dependencies': [ |
| 716 '../base/base.gyp:base', | 716 '../base/base.gyp:base', |
| 717 '../base/base.gyp:test_support_base', | 717 '../base/base.gyp:test_support_base', |
| 718 ], | 718 ], |
| 719 'includes': [ | 719 'includes': [ |
| 720 '../third_party/angle/build/common_defines.gypi', | 720 '../third_party/angle/build/common_defines.gypi', |
| 721 '../third_party/angle/src/tests/angle_end2end_tests.gypi', | 721 '../third_party/angle/src/tests/angle_end2end_tests.gypi', |
| 722 ], | 722 ], |
| 723 'sources': [ | 723 'sources': [ |
| 724 'angle_end2end_tests_main.cc', | 724 'angle_end2end_tests_main.cc', |
| 725 ], | 725 ], |
| 726 }, | 726 }, |
| 727 ], |
| 728 }], |
| 729 ['OS == "win"', { |
| 730 'targets': [ |
| 727 { | 731 { |
| 728 # TODO(jmadill): port this target to the GN build. | 732 # TODO(jmadill): port this target to the GN build. |
| 729 'target_name': 'angle_perftests', | 733 'target_name': 'angle_perftests', |
| 730 'type': '<(gtest_target_type)', | 734 'type': '<(gtest_target_type)', |
| 731 'dependencies': [ | 735 'dependencies': [ |
| 732 '../base/base.gyp:base', | 736 '../base/base.gyp:base', |
| 733 '../base/base.gyp:test_support_base', | 737 '../base/base.gyp:test_support_base', |
| 734 ], | 738 ], |
| 735 'includes': [ | 739 'includes': [ |
| 736 '../third_party/angle/build/common_defines.gypi', | 740 '../third_party/angle/build/common_defines.gypi', |
| (...skipping 26 matching lines...) Expand all Loading... |
| 763 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 767 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
| 764 ], | 768 ], |
| 765 } | 769 } |
| 766 ], | 770 ], |
| 767 ], | 771 ], |
| 768 }, | 772 }, |
| 769 ], | 773 ], |
| 770 }], | 774 }], |
| 771 ], | 775 ], |
| 772 } | 776 } |
| OLD | NEW |