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

Side by Side Diff: gpu/gpu.gyp

Issue 895853003: Update from https://crrev.com/314320 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 10 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/config/gpu_info_collector_win.cc ('k') | gpu/perftests/run_all_tests.cc » ('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 'nacl_win64_target': 0, 7 'nacl_win64_target': 0,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 'gpu_common.gypi', 10 'gpu_common.gypi',
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 'sources': [ 172 'sources': [
173 # Note: sources list duplicated in GN build. 173 # Note: sources list duplicated in GN build.
174 'command_buffer/client/buffer_tracker_unittest.cc', 174 'command_buffer/client/buffer_tracker_unittest.cc',
175 'command_buffer/client/client_test_helper.cc', 175 'command_buffer/client/client_test_helper.cc',
176 'command_buffer/client/client_test_helper.h', 176 'command_buffer/client/client_test_helper.h',
177 'command_buffer/client/cmd_buffer_helper_test.cc', 177 'command_buffer/client/cmd_buffer_helper_test.cc',
178 'command_buffer/client/fenced_allocator_test.cc', 178 'command_buffer/client/fenced_allocator_test.cc',
179 'command_buffer/client/gles2_implementation_unittest.cc', 179 'command_buffer/client/gles2_implementation_unittest.cc',
180 'command_buffer/client/mapped_memory_unittest.cc', 180 'command_buffer/client/mapped_memory_unittest.cc',
181 'command_buffer/client/query_tracker_unittest.cc', 181 'command_buffer/client/query_tracker_unittest.cc',
182 'command_buffer/client/program_info_manager_unittest.cc',
183 'command_buffer/client/ring_buffer_test.cc', 182 'command_buffer/client/ring_buffer_test.cc',
184 'command_buffer/client/transfer_buffer_unittest.cc', 183 'command_buffer/client/transfer_buffer_unittest.cc',
185 'command_buffer/client/vertex_array_object_manager_unittest.cc', 184 'command_buffer/client/vertex_array_object_manager_unittest.cc',
186 'command_buffer/common/bitfield_helpers_test.cc', 185 'command_buffer/common/bitfield_helpers_test.cc',
187 'command_buffer/common/command_buffer_mock.cc', 186 'command_buffer/common/command_buffer_mock.cc',
188 'command_buffer/common/command_buffer_mock.h', 187 'command_buffer/common/command_buffer_mock.h',
189 'command_buffer/common/command_buffer_shared_test.cc', 188 'command_buffer/common/command_buffer_shared_test.cc',
190 'command_buffer/common/debug_marker_manager_unittest.cc', 189 'command_buffer/common/debug_marker_manager_unittest.cc',
191 'command_buffer/common/gles2_cmd_format_test.cc', 190 'command_buffer/common/gles2_cmd_format_test.cc',
192 'command_buffer/common/gles2_cmd_format_test_autogen.h', 191 'command_buffer/common/gles2_cmd_format_test_autogen.h',
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 ['OS=="linux" and use_allocator!="none"', { 273 ['OS=="linux" and use_allocator!="none"', {
275 'dependencies': [ 274 'dependencies': [
276 '../base/allocator/allocator.gyp:allocator', 275 '../base/allocator/allocator.gyp:allocator',
277 ], 276 ],
278 }], 277 }],
279 ], 278 ],
280 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 279 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
281 'msvs_disabled_warnings': [ 4267, ], 280 'msvs_disabled_warnings': [ 4267, ],
282 }, 281 },
283 { 282 {
283 # GN version: //gpu/gpu_perftests
284 'target_name': 'gpu_perftests',
285 'type': '<(gtest_target_type)',
286 'dependencies': [
287 '../base/base.gyp:base',
288 '../base/base.gyp:test_support_base',
289 '../testing/gtest.gyp:gtest',
290 '../testing/perf/perf_test.gyp:perf_test',
291 '../ui/gfx/gfx.gyp:gfx_geometry',
292 '../ui/gl/gl.gyp:gl',
293 ],
294 'sources': [
295 'perftests/run_all_tests.cc',
296 'perftests/texture_upload_perftest.cc',
297 ],
298 },
299 {
284 # GN version: //gpu:gl_tests 300 # GN version: //gpu:gl_tests
285 'target_name': 'gl_tests', 301 'target_name': 'gl_tests',
286 'type': '<(gtest_target_type)', 302 'type': '<(gtest_target_type)',
287 'dependencies': [ 303 'dependencies': [
288 '../base/base.gyp:base', 304 '../base/base.gyp:base',
289 '../base/base.gyp:test_support_base', 305 '../base/base.gyp:test_support_base',
290 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 306 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
291 '../testing/gmock.gyp:gmock', 307 '../testing/gmock.gyp:gmock',
292 '../testing/gtest.gyp:gtest', 308 '../testing/gtest.gyp:gtest',
293 '<(angle_path)/src/angle.gyp:translator', 309 '<(angle_path)/src/angle.gyp:translator',
(...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after
685 '../build/isolate.gypi', 701 '../build/isolate.gypi',
686 ], 702 ],
687 'sources': [ 703 'sources': [
688 'gpu_unittests.isolate', 704 'gpu_unittests.isolate',
689 ], 705 ],
690 }, 706 },
691 ], 707 ],
692 }], 708 }],
693 ], 709 ],
694 } 710 }
OLDNEW
« no previous file with comments | « gpu/config/gpu_info_collector_win.cc ('k') | gpu/perftests/run_all_tests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698