diff options
| author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-19 06:35:21 +0000 |
|---|---|---|
| committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-19 06:35:21 +0000 |
| commit | 3c0edf1d82131458b0aa7c5115a53e62a6421f21 (patch) | |
| tree | 1ea30c39763a51a590e0d0abb47080447f18fed1 /gpu/gpu.gyp | |
| parent | 6954b285be656e38ed8462c8b296c3a8576193e8 (diff) | |
| download | chromium_src-3c0edf1d82131458b0aa7c5115a53e62a6421f21.zip chromium_src-3c0edf1d82131458b0aa7c5115a53e62a6421f21.tar.gz chromium_src-3c0edf1d82131458b0aa7c5115a53e62a6421f21.tar.bz2 | |
Revert r118525 / Re-land r118240 - the build failure was a flake.
This change re-enables building gles2_c_lib as a component.
TBR=gman@chromium.org
BUG=107735
TEST=waterfall stays green
Review URL: https://chromiumcodereview.appspot.com/9150022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118263 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/gpu.gyp')
| -rw-r--r-- | gpu/gpu.gyp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp index 983285a..bc2395d 100644 --- a/gpu/gpu.gyp +++ b/gpu/gpu.gyp @@ -11,6 +11,7 @@ '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', ], @@ -141,11 +142,15 @@ # 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': 'static_library', + 'type': '<(component)', '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)', ], @@ -154,11 +159,14 @@ # 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': 'static_library', + 'type': '<(component)', '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': [ @@ -289,6 +297,9 @@ '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', |