summaryrefslogtreecommitdiffstats
path: root/gpu/gpu.gyp
diff options
context:
space:
mode:
authorzmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-21 23:42:57 +0000
committerzmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-21 23:42:57 +0000
commit7fba3e550c138bf159589476c707a7e1d536055d (patch)
tree3c895c0546e81fdd35a63533bbdf0a1881f5750a /gpu/gpu.gyp
parent02830cac49ac96f0c9dd8c018fb888462127cec9 (diff)
downloadchromium_src-7fba3e550c138bf159589476c707a7e1d536055d.zip
chromium_src-7fba3e550c138bf159589476c707a7e1d536055d.tar.gz
chromium_src-7fba3e550c138bf159589476c707a7e1d536055d.tar.bz2
Revert 201380 "Move GPU device/driver info related code from con..."
> Move GPU device/driver info related code from content to gpu. > > This has been suggested by gman, and agreed by kbr and jam, for the following reasons: > > 1) These are gpu related code, and are independent of content / browser, so putting them under gpu/ is the right thing to do conceptually. > > 2) This enables us to set up tests in various places with the correct blacklisting/driver_bug_workarounds information. Otherwise, for the moment, gpu/ has no visibility into content/ side, so we have to duplicate the driver_bug_workarounds code and hardwire them for testing purpose. This is going to cause a lot of bugs in the future, as we have the two pieces of code for the same thing (one for chrome and one for testing) and people will easily forget to update one or the other. > > As for this patch, I didn't change the logic, and try to minimize the refactoring. All improvements enabled by this relocation will be done in follow-up CLs. > > BUG=230477 > TEST=tree > TBR=gman@chromium.org, joi@chromium.org, kbr@chromium.org, piman@chromium.org > > Review URL: https://codereview.chromium.org/15385003 TBR=zmo@chromium.org Review URL: https://codereview.chromium.org/15619004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201386 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/gpu.gyp')
-rw-r--r--gpu/gpu.gyp21
1 files changed, 0 insertions, 21 deletions
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp
index d9ace92..371f5cd 100644
--- a/gpu/gpu.gyp
+++ b/gpu/gpu.gyp
@@ -206,18 +206,6 @@
'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_unittest.cc',
- 'config/gpu_switching_list_unittest.cc',
- 'config/gpu_util_unittest.cc',
],
'conditions': [
['OS == "android" and gtest_target_type == "shared_library"', {
@@ -332,7 +320,6 @@
'command_buffer_common',
'command_buffer_service',
'gles2_cmd_helper',
- 'gpu_config',
'gpu_ipc',
],
'sources': [
@@ -403,13 +390,6 @@
'command_buffer_common',
],
},
- {
- 'target_name': 'gpu_config',
- 'type': 'static_library',
- 'includes': [
- 'gpu_config.gypi',
- ],
- },
],
},
{ # component != static_library
@@ -432,7 +412,6 @@
'command_buffer_common.gypi',
'command_buffer_service.gypi',
'gles2_cmd_helper.gypi',
- 'gpu_config.gypi',
'gpu_ipc.gypi',
],
'defines': [