Merge gpu_trace_event back into base/debug/trace_event

gpu/gpu.gyp

 # Copyright (c) 2011 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_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',
     ]
   },
   'targets': [
     {
-      'target_name': 'gpu_common',
-      'type': 'static_library',
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-      ],
-      'include_dirs': [
-        '..',
-      ],
-      'sources': [
-        'common/gpu_trace_event.cc',
-        'common/gpu_trace_event.h',
-      ],
-    },
-    {
       'target_name': 'command_buffer_common',
       'type': 'static_library',
       'include_dirs': [
         '.',
       ],
       'all_dependent_settings': {
         'include_dirs': [
           '.',
         ],
       },
@@ skipping 107 matching lines @@
       'include_dirs': [
         '..',
       ],
       'all_dependent_settings': {
         'include_dirs': [
           '..',
         ],
       },
       'dependencies': [
         'command_buffer_common',
-        'gpu_common',
       ],
       'sources': [
         'command_buffer/client/cmd_buffer_helper.cc',
         'command_buffer/client/cmd_buffer_helper.h',
         'command_buffer/client/fenced_allocator.cc',
         'command_buffer/client/fenced_allocator.h',
         'command_buffer/client/mapped_memory.cc',
         'command_buffer/client/mapped_memory.h',
         'command_buffer/client/ring_buffer.cc',
         'command_buffer/client/ring_buffer.h',
       ],
     },
     {
       'target_name': 'command_buffer_service',
       'type': 'static_library',
       'include_dirs': [
         '..',
       ],
       'all_dependent_settings': {
         'include_dirs': [
           '..',
         ],
       },
       'dependencies': [
         'command_buffer_common',
-        'gpu_common',
         '../base/base.gyp:base',
         '../ui/gfx/gl/gl.gyp:gl',
         '../ui/gfx/surface/surface.gyp:surface',
         '../ui/ui.gyp:ui_gfx',
         '../third_party/angle/src/build_angle.gyp:translator_glsl',
       ],
       'sources': [
         'command_buffer/service/buffer_manager.h',
         'command_buffer/service/buffer_manager.cc',
         'command_buffer/service/framebuffer_manager.h',
@@ skipping 50 matching lines @@
       'type': 'executable',
       'dependencies': [
         '../app/app.gyp:app_base',
         '../testing/gmock.gyp:gmock',
         '../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_common',
         'gpu_unittest_utils',
         'gles2_implementation_client_side_arrays',
         'gles2_cmd_helper',
       ],
       '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/ring_buffer_test.cc',
         'command_buffer/common/bitfield_helpers_test.cc',
         'command_buffer/common/command_buffer_mock.cc',
         'command_buffer/common/command_buffer_mock.h',
         'command_buffer/common/gles2_cmd_format_test.cc',
         'command_buffer/common/gles2_cmd_format_test_autogen.h',
         'command_buffer/common/gles2_cmd_id_test.cc',
         'command_buffer/common/gles2_cmd_id_test_autogen.h',
-        'command_buffer/common/gles2_cmd_format_test.cc',
-        'command_buffer/common/gles2_cmd_format_test_autogen.h',
-        'command_buffer/common/gles2_cmd_id_test.cc',
-        'command_buffer/common/gles2_cmd_id_test_autogen.h',
-        'command_buffer/common/gles2_cmd_format_test.cc',
-        'command_buffer/common/gles2_cmd_format_test_autogen.h',
-        'command_buffer/common/gles2_cmd_id_test.cc',
-        'command_buffer/common/gles2_cmd_id_test_autogen.h',
         'command_buffer/common/id_allocator_test.cc',
+        'command_buffer/common/trace_event.h',
         'command_buffer/common/unittest_main.cc',
         'command_buffer/service/buffer_manager_unittest.cc',
-        'command_buffer/service/context_group_unittest.cc',
-        'command_buffer/service/cmd_parser_test.cc',
         'command_buffer/service/cmd_parser_test.cc',
         'command_buffer/service/common_decoder_unittest.cc',
+        'command_buffer/service/context_group_unittest.cc',
         'command_buffer/service/feature_info_unittest.cc',
         'command_buffer/service/framebuffer_manager_unittest.cc',
-        'command_buffer/service/gpu_scheduler_unittest.cc',
-        'command_buffer/service/gles2_cmd_decoder_unittest_base.h',
-        'command_buffer/service/gles2_cmd_decoder_unittest_base.cc',
         'command_buffer/service/gles2_cmd_decoder_unittest.cc',
         'command_buffer/service/gles2_cmd_decoder_unittest_1.cc',
         'command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h',
         'command_buffer/service/gles2_cmd_decoder_unittest_2.cc',
         'command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h',
         'command_buffer/service/gles2_cmd_decoder_unittest_3.cc',
         'command_buffer/service/gles2_cmd_decoder_unittest_3_autogen.h',
+        'command_buffer/service/gles2_cmd_decoder_unittest_base.cc',
+        'command_buffer/service/gles2_cmd_decoder_unittest_base.h',
+        'command_buffer/service/gpu_scheduler_unittest.cc',
         'command_buffer/service/id_manager_unittest.cc',
         'command_buffer/service/mocks.cc',
         'command_buffer/service/mocks.h',
         'command_buffer/service/program_manager_unittest.cc',
         'command_buffer/service/renderbuffer_manager_unittest.cc',
         'command_buffer/service/shader_manager_unittest.cc',
         'command_buffer/service/shader_translator_unittest.cc',
+        'command_buffer/service/test_helper.cc',
         'command_buffer/service/test_helper.h',
-        'command_buffer/service/test_helper.cc',
         'command_buffer/service/texture_manager_unittest.cc',
       ],
     },
     {
       'target_name': 'gpu_unittest_utils',
       'type': 'static_library',
       'dependencies': [
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../ui/gfx/gl/gl.gyp:gl',
@@ skipping 66 matching lines @@
       },
     ],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: