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

Unified Diff: gpu/gpu.gyp

Issue 8633020: Revert 111170 - Move GL headers from gpu to third_party/khronos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 1 month 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
Index: gpu/gpu.gyp
===================================================================
--- gpu/gpu.gyp (revision 111172)
+++ gpu/gpu.gyp (working copy)
@@ -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',
« no previous file with comments | « gpu/gles2_conform_support/gles2_conform_support.gyp ('k') | ppapi/native_client/src/shared/ppapi_proxy/nacl.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698