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

Unified Diff: gpu/gpu.gyp

Issue 465040: Added CommandBufferClient, CommandBufferStub and some IPC messages.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years 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/command_buffer/service/x_utils.cc ('k') | gpu/gpu_plugin/gpu_plugin.h » ('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 34314)
+++ gpu/gpu.gyp (working copy)
@@ -80,6 +80,9 @@
'..',
],
},
+ 'dependencies': [
+ '../base/base.gyp:base',
+ ],
'sources': [
'command_buffer/common/bitfield_helpers.h',
'command_buffer/common/cmd_buffer_common.h',
@@ -107,7 +110,6 @@
'type': 'static_library',
'dependencies': [
'command_buffer_common',
- 'np_utils',
],
'sources': [
'command_buffer/client/gles2_cmd_helper.cc',
@@ -271,68 +273,12 @@
},
},
{
- 'target_name': 'np_utils',
- 'type': '<(library)',
- 'dependencies': [
- '../base/base.gyp:base',
- ],
- 'include_dirs': [
- '..',
- ],
- 'all_dependent_settings': {
- 'include_dirs': [
- '..',
- ],
- },
- 'sources': [
- 'np_utils/default_np_object.h',
- 'np_utils/dynamic_np_object.cc',
- 'np_utils/dynamic_np_object.h',
- 'np_utils/np_browser.cc',
- 'np_utils/np_browser.h',
- 'np_utils/np_browser_mock.h',
- 'np_utils/np_browser_stub.cc',
- 'np_utils/np_browser_stub.h',
- 'np_utils/np_class.h',
- 'np_utils/np_dispatcher.cc',
- 'np_utils/np_dispatcher.h',
- 'np_utils/np_dispatcher_specializations.h',
- 'np_utils/np_headers.h',
- 'np_utils/np_object_mock.h',
- 'np_utils/np_object_pointer.h',
- 'np_utils/np_plugin_object.h',
- 'np_utils/np_plugin_object_mock.h',
- 'np_utils/np_plugin_object_factory.cc',
- 'np_utils/np_plugin_object_factory.h',
- 'np_utils/np_plugin_object_factory_mock.h',
- 'np_utils/np_utils.cc',
- 'np_utils/np_utils.h',
- 'np_utils/webkit_browser.h',
- ],
- },
- {
- 'target_name': 'np_utils_unittests',
- 'type': 'none',
- 'direct_dependent_settings': {
- 'include_dirs': [
- '..',
- ],
- 'sources': [
- 'np_utils/dispatched_np_object_unittest.cc',
- 'np_utils/dynamic_np_object_unittest.cc',
- 'np_utils/np_class_unittest.cc',
- 'np_utils/np_object_pointer_unittest.cc',
- 'np_utils/np_utils_unittest.cc',
- ],
- },
- },
- {
'target_name': 'gpu_plugin',
'type': '<(library)',
'dependencies': [
'../base/base.gyp:base',
+ '../chrome/chrome.gyp:plugin',
'command_buffer_service',
- 'np_utils',
],
'include_dirs': [
'..',
@@ -345,28 +291,9 @@
'sources': [
'gpu_plugin/gpu_plugin.cc',
'gpu_plugin/gpu_plugin.h',
- 'gpu_plugin/gpu_plugin_object.cc',
- 'gpu_plugin/gpu_plugin_object.h',
- 'gpu_plugin/gpu_plugin_object_win.cc',
- 'gpu_plugin/gpu_plugin_object_factory.cc',
- 'gpu_plugin/gpu_plugin_object_factory.h',
],
},
{
- 'target_name': 'gpu_plugin_unittests',
- 'type': 'none',
- 'direct_dependent_settings': {
- 'include_dirs': [
- '..',
- ],
- 'sources': [
- 'gpu_plugin/gpu_plugin_unittest.cc',
- 'gpu_plugin/gpu_plugin_object_unittest.cc',
- 'gpu_plugin/gpu_plugin_object_factory_unittest.cc',
- ],
- },
- },
- {
'target_name': 'gpu_all_unittests',
'type': 'executable',
'dependencies': [
@@ -379,10 +306,6 @@
'command_buffer_common_unittests',
'command_buffer_service',
'command_buffer_service_unittests',
- 'gpu_plugin',
- 'gpu_plugin_unittests',
- 'np_utils',
- 'np_utils_unittests',
],
},
{
@@ -394,7 +317,6 @@
'gles2_lib',
'gles2_c_lib',
'gpu_plugin',
- 'np_utils',
],
'sources': [
'command_buffer/client/gles2_demo.cc',
« no previous file with comments | « gpu/command_buffer/service/x_utils.cc ('k') | gpu/gpu_plugin/gpu_plugin.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698