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

gpu/gpu.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
     # These are defined here because we need to build this library twice. Once
     # with extra parameter checking. Once with no parameter checking to be 100%
     # OpenGL ES 2.0 compliant for the conformance tests.
     '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',
     ],
     # These are defined here because we need to build this library twice. Once
     # with without support for client side arrays and once with for pepper and
     # the OpenGL ES 2.0 compliant for the conformance tests.
     'gles2_implementation_source_files': [
       'command_buffer/client/gles2_implementation_autogen.h',
       'command_buffer/client/gles2_implementation.cc',
       'command_buffer/client/gles2_implementation.h',
@@ skipping 110 matching lines @@
         ],
       },
       'sources': [
         '<@(gles2_implementation_source_files)',
       ],
     },
     {
       # 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)',
       ],
     },
     {
       # 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': [
         '<@(gles2_c_lib_source_files)',
       ],
     },
     {
       'target_name': 'command_buffer_client',
       'type': 'static_library',
       'include_dirs': [
@@ skipping 110 matching lines @@
         '../testing/gmock.gyp:gmock_main',
         '../testing/gtest.gyp:gtest',
         '../ui/gfx/gl/gl.gyp:gl',
         'command_buffer_client',
         'command_buffer_common',
         'command_buffer_service',
         'gpu_unittest_utils',
         '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',
         'command_buffer/client/fenced_allocator_test.cc',
         'command_buffer/client/gles2_implementation_unittest.cc',
         'command_buffer/client/mapped_memory_unittest.cc',
         'command_buffer/client/program_info_manager_unittest.cc',
         'command_buffer/client/ring_buffer_test.cc',
         'command_buffer/common/bitfield_helpers_test.cc',
         'command_buffer/common/command_buffer_mock.cc',
@@ skipping 70 matching lines @@
         '..',
         '<(DEPTH)/third_party/khronos',
       ],
       'sources': [
         'ipc/gpu_command_buffer_traits.cc',
         'ipc/gpu_command_buffer_traits.h',
       ],
     },
   ],
 }