summaryrefslogtreecommitdiffstats
path: root/gpu/gpu_common.gypi
diff options
context:
space:
mode:
Diffstat (limited to 'gpu/gpu_common.gypi')
-rw-r--r--gpu/gpu_common.gypi30
1 files changed, 7 insertions, 23 deletions
diff --git a/gpu/gpu_common.gypi b/gpu/gpu_common.gypi
index 2d13ec9..4d24613 100644
--- a/gpu/gpu_common.gypi
+++ b/gpu/gpu_common.gypi
@@ -196,28 +196,6 @@
],
},
{
- 'target_name': 'gl_unittests',
- 'type': 'static_library',
- 'dependencies': [
- '../base/base.gyp:base',
- '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
- '../testing/gmock.gyp:gmock',
- '../testing/gtest.gyp:gtest',
- 'gles2_implementation_client_side_arrays',
- ],
- 'defines': [
- 'GLES2_C_LIB_IMPLEMENTATION',
- 'GL_GLEXT_PROTOTYPES',
- ],
- 'sources': [
- 'command_buffer/tests/gl_test_utils.cc',
- 'command_buffer/tests/gl_test_utils.h',
- 'command_buffer/tests/gl_texture_mailbox_unittests.cc',
- 'command_buffer/tests/gl_unittests.cc',
- 'command_buffer/tests/occlusion_query_unittests.cc',
- ],
- },
- {
'target_name': 'gl_tests',
'type': 'executable',
'dependencies': [
@@ -235,17 +213,23 @@
'gpu_unittest_utils',
'gles2_implementation_client_side_arrays',
'gles2_cmd_helper',
- 'gl_unittests',
+ #'gl_unittests',
],
'defines': [
'GLES2_C_LIB_IMPLEMENTATION',
+ 'GL_GLEXT_PROTOTYPES',
],
'sources': [
'<@(gles2_c_lib_source_files)',
+ 'command_buffer/tests/occlusion_query_unittests.cc',
'command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc',
'command_buffer/tests/gl_manager.cc',
'command_buffer/tests/gl_manager.h',
'command_buffer/tests/gl_tests_main.cc',
+ 'command_buffer/tests/gl_test_utils.cc',
+ 'command_buffer/tests/gl_test_utils.h',
+ 'command_buffer/tests/gl_texture_mailbox_unittests.cc',
+ 'command_buffer/tests/gl_unittests.cc',
],
},
{