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

Side by Side Diff: gpu/gpu.gyp

Issue 1038743003: gpu: Fix some jmadill's TODOs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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 | « gpu/angle_end2end_tests_main.cc ('k') | no next file » | 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 'nacl_win64_target': 0, 7 'nacl_win64_target': 0,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 'gpu_common.gypi', 10 'gpu_common.gypi',
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 '<@(gles2_c_lib_source_files)', 123 '<@(gles2_c_lib_source_files)',
124 ], 124 ],
125 }, 125 },
126 { 126 {
127 # GN version: //gpu:angle_unittests 127 # GN version: //gpu:angle_unittests
128 # TODO(kbr): port this refactoring to the GN build. 128 # TODO(kbr): port this refactoring to the GN build.
129 'target_name': 'angle_unittests', 129 'target_name': 'angle_unittests',
130 'type': '<(gtest_target_type)', 130 'type': '<(gtest_target_type)',
131 'includes': [ 131 'includes': [
132 '../third_party/angle/build/common_defines.gypi', 132 '../third_party/angle/build/common_defines.gypi',
133 '../third_party/angle/tests/angle_unittests.gypi', 133 '../third_party/angle/src/tests/angle_unittests.gypi',
134 ], 134 ],
135 'dependencies': [ 135 'dependencies': [
136 '../base/base.gyp:base', 136 '../base/base.gyp:base',
137 '../base/base.gyp:test_support_base', 137 '../base/base.gyp:test_support_base',
138 ], 138 ],
139 'include_dirs': [ 139 'include_dirs': [
140 '..', 140 '..',
141 '../third_party/angle/include', 141 '../third_party/angle/include',
142 ], 142 ],
143 'sources': 143 'sources': [
144 [
145 'angle_unittest_main.cc', 144 'angle_unittest_main.cc',
146 ], 145 ],
147 }, 146 },
148 { 147 {
149 # GN version: //gpu:gpu_unittests 148 # GN version: //gpu:gpu_unittests
150 'target_name': 'gpu_unittests', 149 'target_name': 'gpu_unittests',
151 'type': '<(gtest_target_type)', 150 'type': '<(gtest_target_type)',
152 'dependencies': [ 151 'dependencies': [
153 '../base/base.gyp:base', 152 '../base/base.gyp:base',
154 '../base/base.gyp:test_support_base', 153 '../base/base.gyp:test_support_base',
(...skipping 549 matching lines...) Expand 10 before | Expand all | Expand 10 after
704 ['OS == "win"', { 703 ['OS == "win"', {
705 'targets': [ 704 'targets': [
706 { 705 {
707 # TODO(kbr): port this target to the GN build. 706 # TODO(kbr): port this target to the GN build.
708 'target_name': 'angle_end2end_tests', 707 'target_name': 'angle_end2end_tests',
709 'type': '<(gtest_target_type)', 708 'type': '<(gtest_target_type)',
710 'dependencies': [ 709 'dependencies': [
711 '../base/base.gyp:base', 710 '../base/base.gyp:base',
712 '../base/base.gyp:test_support_base', 711 '../base/base.gyp:test_support_base',
713 ], 712 ],
714 'includes': 713 'includes': [
715 [
716 '../third_party/angle/build/common_defines.gypi', 714 '../third_party/angle/build/common_defines.gypi',
717 '../third_party/angle/tests/angle_end2end_tests.gypi', 715 '../third_party/angle/src/tests/angle_end2end_tests.gypi',
718 ], 716 ],
719 'sources': 717 'sources': [
720 [
721 'angle_end2end_tests_main.cc', 718 'angle_end2end_tests_main.cc',
722 ], 719 ],
723 }, 720 },
724 { 721 {
725 # TODO(jmadill): port this target to the GN build. 722 # TODO(jmadill): port this target to the GN build.
726 'target_name': 'angle_perftests', 723 'target_name': 'angle_perftests',
727 'type': '<(gtest_target_type)', 724 'type': '<(gtest_target_type)',
728 'dependencies': [ 725 'dependencies': [
729 '../base/base.gyp:base', 726 '../base/base.gyp:base',
730 '../base/base.gyp:test_support_base', 727 '../base/base.gyp:test_support_base',
731 ], 728 ],
732 'includes': 729 'includes': [
733 [
734 '../third_party/angle/build/common_defines.gypi', 730 '../third_party/angle/build/common_defines.gypi',
735 '../third_party/angle/src/tests/angle_perftests.gypi', 731 '../third_party/angle/src/tests/angle_perftests.gypi',
736 ], 732 ],
737 'sources': 733 'sources': [
738 [
739 'angle_perftests_main.cc', 734 'angle_perftests_main.cc',
740 ], 735 ],
741 }, 736 },
742 ], 737 ],
743 }], 738 }],
744 ['test_isolation_mode != "noop"', { 739 ['test_isolation_mode != "noop"', {
745 'targets': [ 740 'targets': [
746 { 741 {
747 'target_name': 'gpu_unittests_run', 742 'target_name': 'gpu_unittests_run',
748 'type': 'none', 743 'type': 'none',
749 'dependencies': [ 744 'dependencies': [
750 'gpu_unittests', 745 'gpu_unittests',
751 ], 746 ],
752 'includes': [ 747 'includes': [
753 '../build/isolate.gypi', 748 '../build/isolate.gypi',
754 ], 749 ],
755 'sources': [ 750 'sources': [
756 'gpu_unittests.isolate', 751 'gpu_unittests.isolate',
757 ], 752 ],
758 }, 753 },
759 ], 754 ],
760 }], 755 }],
761 ], 756 ],
762 } 757 }
OLDNEW
« no previous file with comments | « gpu/angle_end2end_tests_main.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698