diff options
| author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-19 05:39:17 +0000 |
|---|---|---|
| committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-19 05:39:17 +0000 |
| commit | 96fba197b33d6d831f5cfd2469202db4b6506557 (patch) | |
| tree | 84987c766b9437b61de2df51e4f3314d525aceaa /gpu/gpu.gyp | |
| parent | e6aa46992d11da1581f65c47e4f4c9bf81a27036 (diff) | |
| download | chromium_src-96fba197b33d6d831f5cfd2469202db4b6506557.zip chromium_src-96fba197b33d6d831f5cfd2469202db4b6506557.tar.gz chromium_src-96fba197b33d6d831f5cfd2469202db4b6506557.tar.bz2 | |
Revert r118240 - gles_2_c_lib as a component.
Broke compile on windows.
TBR=gman@chromium.org
BUG=107735
TEST=waterfall greens up again
Review URL: https://chromiumcodereview.appspot.com/9264003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118252 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/gpu.gyp')
| -rw-r--r-- | gpu/gpu.gyp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp index bc2395d..983285a 100644 --- a/gpu/gpu.gyp +++ b/gpu/gpu.gyp @@ -11,7 +11,6 @@ 'gles2_c_lib_source_files': [ 'command_buffer/client/gles2_c_lib.cc', 'command_buffer/client/gles2_c_lib_autogen.h', - 'command_buffer/client/gles2_c_lib_export.h', 'command_buffer/client/gles2_lib.h', 'command_buffer/client/gles2_lib.cc', ], @@ -142,15 +141,11 @@ # Stub to expose gles2_implemenation in C instead of C++. # so GLES2 C programs can work with no changes. 'target_name': 'gles2_c_lib', - 'type': '<(component)', + 'type': 'static_library', 'dependencies': [ '../base/base.gyp:base', - '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', 'gles2_implementation', ], - 'defines': [ - 'GLES2_C_LIB_IMPLEMENTATION', - ], 'sources': [ '<@(gles2_c_lib_source_files)', ], @@ -159,14 +154,11 @@ # Same as gles2_c_lib except with no parameter checking. Required for # OpenGL ES 2.0 conformance tests. 'target_name': 'gles2_c_lib_nocheck', - 'type': '<(component)', + 'type': 'static_library', 'defines': [ - 'GLES2_C_LIB_IMPLEMENTATION', 'GLES2_CONFORMANCE_TESTS=1', ], 'dependencies': [ - '../base/base.gyp:base', - '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', 'gles2_implementation_client_side_arrays_no_check', ], 'sources': [ @@ -297,9 +289,6 @@ 'gles2_implementation_client_side_arrays', 'gles2_cmd_helper', ], - 'defines': [ - 'GLES2_C_LIB_IMPLEMENTATION', - ], 'sources': [ '<@(gles2_c_lib_source_files)', 'command_buffer/client/cmd_buffer_helper_test.cc', |