summaryrefslogtreecommitdiffstats
path: root/gpu/gpu.gyp
diff options
context:
space:
mode:
authorgman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-08 22:58:58 +0000
committergman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-08 22:58:58 +0000
commit9f427328e5f5794d29b4b4fbf2439f0ba86daa0e (patch)
tree8a45c0bddc83cab50a6cc5462f98890eaf750a73 /gpu/gpu.gyp
parent3fb28bac3a97af687de76d830d42fe974422f910 (diff)
downloadchromium_src-9f427328e5f5794d29b4b4fbf2439f0ba86daa0e.zip
chromium_src-9f427328e5f5794d29b4b4fbf2439f0ba86daa0e.tar.gz
chromium_src-9f427328e5f5794d29b4b4fbf2439f0ba86daa0e.tar.bz2
Rearrange GLES2 files so they are easier to use
from native client and pepper. TEST=none BUG=none Review URL: http://codereview.chromium.org/668205 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40956 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/gpu.gyp')
-rw-r--r--gpu/gpu.gyp13
1 files changed, 4 insertions, 9 deletions
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp
index 81685c6..22cb17c 100644
--- a/gpu/gpu.gyp
+++ b/gpu/gpu.gyp
@@ -94,12 +94,12 @@
'target_name': 'command_buffer_common',
'type': 'static_library',
'include_dirs': [
- 'command_buffer/common',
+ '.',
'..',
],
'all_dependent_settings': {
'include_dirs': [
- 'command_buffer/common',
+ '.',
'..',
],
},
@@ -123,8 +123,6 @@
'command_buffer/common/gles2_cmd_utils.h',
'command_buffer/common/logging.h',
'command_buffer/common/mocks.h',
- 'command_buffer/common/resource.cc',
- 'command_buffer/common/resource.h',
'command_buffer/common/thread_local.h',
'command_buffer/common/types.h',
],
@@ -152,7 +150,7 @@
'all_dependent_settings': {
'include_dirs': [
# For GLES2/gl2.h
- 'command_buffer/common',
+ '.',
],
},
'sources': [
@@ -192,7 +190,7 @@
'target_name': 'command_buffer_common_unittests',
'type': 'none',
'include_dirs': [
- 'command_buffer/common',
+ '.',
],
'dependencies': [
'gles2_lib',
@@ -260,8 +258,6 @@
'command_buffer/service/mocks.h',
'command_buffer/service/precompile.cc',
'command_buffer/service/precompile.h',
- 'command_buffer/service/resource.cc',
- 'command_buffer/service/resource.h',
],
'conditions': [
['OS == "linux"',
@@ -327,7 +323,6 @@
'command_buffer/service/cmd_parser_test.cc',
'command_buffer/service/common_decoder_unittest.cc',
'command_buffer/service/gpu_processor_unittest.cc',
- 'command_buffer/service/resource_test.cc',
'command_buffer/service/gl_interface.h',
'command_buffer/service/gl_interface.cc',
'command_buffer/service/gl_mock.h',