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

Unified Diff: gpu/gpu.gyp

Issue 15745014: Move GPU device/driver info related code from content to gpu. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: rebase Created 7 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/config/software_rendering_list_json.cc ('k') | gpu/gpu_config.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/gpu.gyp
===================================================================
--- gpu/gpu.gyp (revision 201645)
+++ gpu/gpu.gyp (working copy)
@@ -206,6 +206,19 @@
'command_buffer/service/transfer_buffer_manager_unittest.cc',
'command_buffer/service/vertex_attrib_manager_unittest.cc',
'command_buffer/service/vertex_array_manager_unittest.cc',
+ 'config/gpu_blacklist_unittest.cc',
+ 'config/gpu_control_list_entry_unittest.cc',
+ 'config/gpu_control_list_machine_model_info_unittest.cc',
+ 'config/gpu_control_list_number_info_unittest.cc',
+ 'config/gpu_control_list_os_info_unittest.cc',
+ 'config/gpu_control_list_string_info_unittest.cc',
+ 'config/gpu_control_list_unittest.cc',
+ 'config/gpu_control_list_version_info_unittest.cc',
+ 'config/gpu_driver_bug_list_unittest.cc',
+ 'config/gpu_info_collector_unittest.cc',
+ 'config/gpu_info_unittest.cc',
+ 'config/gpu_switching_list_unittest.cc',
+ 'config/gpu_util_unittest.cc',
],
'conditions': [
['OS == "android" and gtest_target_type == "shared_library"', {
@@ -320,6 +333,7 @@
'command_buffer_common',
'command_buffer_service',
'gles2_cmd_helper',
+ 'gpu_config',
'gpu_ipc',
],
'sources': [
@@ -390,6 +404,13 @@
'command_buffer_common',
],
},
+ {
+ 'target_name': 'gpu_config',
+ 'type': 'static_library',
+ 'includes': [
+ 'gpu_config.gypi',
+ ],
+ },
],
},
{ # component != static_library
@@ -412,6 +433,7 @@
'command_buffer_common.gypi',
'command_buffer_service.gypi',
'gles2_cmd_helper.gypi',
+ 'gpu_config.gypi',
'gpu_ipc.gypi',
],
'defines': [
« no previous file with comments | « gpu/config/software_rendering_list_json.cc ('k') | gpu/gpu_config.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698