Index: gpu/gpu_common.gypi |
=================================================================== |
--- gpu/gpu_common.gypi (revision 124044) |
+++ gpu/gpu_common.gypi (working copy) |
@@ -3,67 +3,13 @@ |
# 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', |
- 'command_buffer/client/program_info_manager.cc', |
- 'command_buffer/client/program_info_manager.h', |
- ] |
- }, |
'targets': [ |
{ |
- 'target_name': 'command_buffer_common', |
- 'type': 'static_library', |
- 'includes': [ |
- 'command_buffer_common.gypi', |
- ], |
- 'export_dependent_settings': [ |
- '../base/base.gyp:base', |
- ], |
- }, |
- { |
- # Library helps make GLES2 command buffers. |
- 'target_name': 'gles2_cmd_helper', |
- 'type': 'static_library', |
- 'includes': [ |
- 'gles2_cmd_helper.gypi', |
- ], |
- 'dependencies': [ |
- 'command_buffer_client', |
- ], |
- }, |
- { |
# Library emulates GLES2 using command_buffers. |
- 'target_name': 'gles2_implementation', |
- 'type': 'static_library', |
- 'includes': [ |
- 'gles2_implementation.gypi', |
- ], |
- 'dependencies': [ |
- 'gles2_cmd_helper', |
- ], |
- }, |
- { |
- # Library emulates GLES2 using command_buffers. |
'target_name': 'gles2_implementation_client_side_arrays', |
'type': 'static_library', |
'defines': [ |
+ 'COMPILE_GPU_STATICALLY', |
'GLES2_SUPPORT_CLIENT_SIDE_ARRAYS=1', |
], |
'dependencies': [ |
@@ -85,6 +31,7 @@ |
'target_name': 'gles2_implementation_client_side_arrays_no_check', |
'type': 'static_library', |
'defines': [ |
+ 'COMPILE_GPU_STATICALLY', |
'GLES2_SUPPORT_CLIENT_SIDE_ARRAYS=1', |
'GLES2_CONFORMANCE_TESTS=1', |
], |
@@ -138,26 +85,6 @@ |
], |
}, |
{ |
- 'target_name': 'command_buffer_client', |
- 'type': 'static_library', |
- 'includes': [ |
- 'command_buffer_client.gypi', |
- ], |
- 'dependencies': [ |
- 'command_buffer_common', |
- ], |
- }, |
- { |
- 'target_name': 'command_buffer_service', |
- 'type': 'static_library', |
- 'includes': [ |
- 'command_buffer_service.gypi', |
- ], |
- 'dependencies': [ |
- 'command_buffer_common', |
- ], |
- }, |
- { |
'target_name': 'gpu_unittests', |
'type': 'executable', |
'dependencies': [ |
@@ -165,7 +92,10 @@ |
'../testing/gmock.gyp:gmock', |
'../testing/gmock.gyp:gmock_main', |
'../testing/gtest.gyp:gtest', |
+ '../third_party/angle/src/build_angle.gyp:translator_glsl', |
'../ui/gfx/gl/gl.gyp:gl', |
+ '../ui/ui.gyp:ui', |
+ 'command_buffer/command_buffer.gyp:gles2_utils', |
'command_buffer_client', |
'command_buffer_common', |
'command_buffer_service', |
@@ -249,15 +179,5 @@ |
'command_buffer/service/gles2_cmd_decoder_mock.cc', |
], |
}, |
- { |
- 'target_name': 'gpu_ipc', |
- 'type': 'static_library', |
- 'includes': [ |
- 'gpu_ipc.gypi', |
- ], |
- 'dependencies': [ |
- 'command_buffer_client', |
- ], |
- }, |
], |
} |