diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-05-14 12:12:37 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-05-14 12:12:37 +0100 |
| commit | 010d83a9304c5a91596085d917d248abff47903a (patch) | |
| tree | 41ef1a01862f352f9653c7a9cfa817abefe2cce2 /gpu/gpu.gyp | |
| parent | 08c107de54178bb0990a09adec724924e8bc9486 (diff) | |
| download | chromium_org-010d83a9304c5a91596085d917d248abff47903a.tar.gz | |
Merge from Chromium at DEPS revision 269336
This commit was generated by merge_to_master.py.
Change-Id: I8b9c77f10eccd2a8b4c7ce373ffda18568af54ff
Diffstat (limited to 'gpu/gpu.gyp')
| -rw-r--r-- | gpu/gpu.gyp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp index 8022d48834..b0ccb9936e 100644 --- a/gpu/gpu.gyp +++ b/gpu/gpu.gyp @@ -228,6 +228,7 @@ 'command_buffer/service/feature_info_unittest.cc', 'command_buffer/service/framebuffer_manager_unittest.cc', 'command_buffer/service/gles2_cmd_decoder_unittest.cc', + 'command_buffer/service/gles2_cmd_decoder_unittest.h', 'command_buffer/service/gles2_cmd_decoder_unittest_0_autogen.h', 'command_buffer/service/gles2_cmd_decoder_unittest_1.cc', 'command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h', @@ -235,8 +236,15 @@ '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_async_pixel.cc', 'command_buffer/service/gles2_cmd_decoder_unittest_base.cc', 'command_buffer/service/gles2_cmd_decoder_unittest_base.h', + 'command_buffer/service/gles2_cmd_decoder_unittest_context_state.cc', + 'command_buffer/service/gles2_cmd_decoder_unittest_drawing.cc', + 'command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.cc', + 'command_buffer/service/gles2_cmd_decoder_unittest_programs.cc', + 'command_buffer/service/gles2_cmd_decoder_unittest_textures.cc', + 'command_buffer/service/gles2_cmd_decoder_unittest_attribs.cc', 'command_buffer/service/gl_surface_mock.cc', 'command_buffer/service/gl_surface_mock.h', 'command_buffer/service/gpu_scheduler_unittest.cc', @@ -279,8 +287,7 @@ ], }], # See http://crbug.com/162998#c4 for why this is needed. - # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 - ['OS=="linux" and ((use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1))', { + ['OS=="linux" and use_allocator!="none"', { 'dependencies': [ '../base/allocator/allocator.gyp:allocator', ], |