summaryrefslogtreecommitdiffstats
path: root/gpu/gpu.gyp
diff options
context:
space:
mode:
authorabodenha@chromium.org <abodenha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-22 18:19:23 +0000
committerabodenha@chromium.org <abodenha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-22 18:19:23 +0000
commit8ee503f6c24c6531618ce8d9569af1fd16c5e071 (patch)
treed1f6977a11a1e143f111c2f08860e829078f9666 /gpu/gpu.gyp
parent108e031e12f8300ddc545837fe704de4710f542e (diff)
downloadchromium_src-8ee503f6c24c6531618ce8d9569af1fd16c5e071.zip
chromium_src-8ee503f6c24c6531618ce8d9569af1fd16c5e071.tar.gz
chromium_src-8ee503f6c24c6531618ce8d9569af1fd16c5e071.tar.bz2
Revert 111170 - Move GL headers from gpu to third_party/khronos
This change moves the OpenGL ES and EGL header files from gpu/ to a new third_party/khronos/ directory. The headers are also rebased to the latest upstream versions. BUG=102824 TEST=none Review URL: http://codereview.chromium.org/8423038 TBR=skyostil@google.com Review URL: http://codereview.chromium.org/8633020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111173 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/gpu.gyp')
-rw-r--r--gpu/gpu.gyp14
1 files changed, 4 insertions, 10 deletions
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp
index adbc241..ab5650a 100644
--- a/gpu/gpu.gyp
+++ b/gpu/gpu.gyp
@@ -30,11 +30,11 @@
'target_name': 'command_buffer_common',
'type': 'static_library',
'include_dirs': [
- '<(DEPTH)/third_party/khronos',
+ '.',
],
'all_dependent_settings': {
'include_dirs': [
- '<(DEPTH)/third_party/khronos',
+ '.',
],
},
'dependencies': [
@@ -90,7 +90,7 @@
'all_dependent_settings': {
'include_dirs': [
# For GLES2/gl2.h
- '<(DEPTH)/third_party/khronos',
+ '.',
],
},
'sources': [
@@ -112,7 +112,7 @@
'all_dependent_settings': {
'include_dirs': [
# For GLES2/gl2.h
- '<(DEPTH)/third_party/khronos',
+ '.',
],
},
'sources': [
@@ -152,12 +152,10 @@
'type': 'static_library',
'include_dirs': [
'..',
- '<(DEPTH)/third_party/khronos',
],
'all_dependent_settings': {
'include_dirs': [
'..',
- '<(DEPTH)/third_party/khronos',
],
},
'dependencies': [
@@ -179,12 +177,10 @@
'type': 'static_library',
'include_dirs': [
'..',
- '<(DEPTH)/third_party/khronos',
],
'all_dependent_settings': {
'include_dirs': [
'..',
- '<(DEPTH)/third_party/khronos',
],
},
'dependencies': [
@@ -331,7 +327,6 @@
],
'include_dirs': [
'..',
- '<(DEPTH)/third_party/khronos',
],
'sources': [
'command_buffer/common/gl_mock.h',
@@ -350,7 +345,6 @@
],
'include_dirs': [
'..',
- '<(DEPTH)/third_party/khronos',
],
'sources': [
'ipc/gpu_command_buffer_traits.cc',