Revert r118525 / Re-land r118240 - the build failure was a flake.

gpu/gpu.gyp

Index: gpu/gpu.gyp
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp
index 983285af8949a4c2ae611df34ef5d793b913794d..bc2395d0e3508d624af92e31723b7f1fa8bc3f30 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',