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

Side by Side Diff: gpu/gpu.gyp

Issue 122723002: Fixed not-unique event 'id' in TRACE_EVENT from GLARBTimerTrace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed another GPU_EXPORT issue. Created 6 years, 11 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/command_buffer/service/gpu_tracer_unittest.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 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 'command_buffer/service/stream_texture_mock.cc', 238 'command_buffer/service/stream_texture_mock.cc',
239 'command_buffer/service/stream_texture_mock.h', 239 'command_buffer/service/stream_texture_mock.h',
240 'command_buffer/service/stream_texture_manager_mock.cc', 240 'command_buffer/service/stream_texture_manager_mock.cc',
241 'command_buffer/service/stream_texture_manager_mock.h', 241 'command_buffer/service/stream_texture_manager_mock.h',
242 'command_buffer/service/test_helper.cc', 242 'command_buffer/service/test_helper.cc',
243 'command_buffer/service/test_helper.h', 243 'command_buffer/service/test_helper.h',
244 'command_buffer/service/texture_manager_unittest.cc', 244 'command_buffer/service/texture_manager_unittest.cc',
245 'command_buffer/service/transfer_buffer_manager_unittest.cc', 245 'command_buffer/service/transfer_buffer_manager_unittest.cc',
246 'command_buffer/service/vertex_attrib_manager_unittest.cc', 246 'command_buffer/service/vertex_attrib_manager_unittest.cc',
247 'command_buffer/service/vertex_array_manager_unittest.cc', 247 'command_buffer/service/vertex_array_manager_unittest.cc',
248 'command_buffer/service/gpu_tracer_unittest.cc',
248 'config/gpu_blacklist_unittest.cc', 249 'config/gpu_blacklist_unittest.cc',
249 'config/gpu_control_list_entry_unittest.cc', 250 'config/gpu_control_list_entry_unittest.cc',
250 'config/gpu_control_list_machine_model_info_unittest.cc', 251 'config/gpu_control_list_machine_model_info_unittest.cc',
251 'config/gpu_control_list_number_info_unittest.cc', 252 'config/gpu_control_list_number_info_unittest.cc',
252 'config/gpu_control_list_os_info_unittest.cc', 253 'config/gpu_control_list_os_info_unittest.cc',
253 'config/gpu_control_list_string_info_unittest.cc', 254 'config/gpu_control_list_string_info_unittest.cc',
254 'config/gpu_control_list_unittest.cc', 255 'config/gpu_control_list_unittest.cc',
255 'config/gpu_control_list_version_info_unittest.cc', 256 'config/gpu_control_list_version_info_unittest.cc',
256 'config/gpu_driver_bug_list_unittest.cc', 257 'config/gpu_driver_bug_list_unittest.cc',
257 'config/gpu_info_collector_unittest.cc', 258 'config/gpu_info_collector_unittest.cc',
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
577 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)gl_tests< (SHARED_LIB_SUFFIX)', 578 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)gl_tests< (SHARED_LIB_SUFFIX)',
578 }, 579 },
579 'includes': [ 580 'includes': [
580 '../build/apk_test.gypi', 581 '../build/apk_test.gypi',
581 ], 582 ],
582 }, 583 },
583 ], 584 ],
584 }], 585 }],
585 ], 586 ],
586 } 587 }
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/gpu_tracer_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698