diff options
author | Torne (Richard Coles) <torne@google.com> | 2014-08-28 12:05:23 +0100 |
---|---|---|
committer | Torne (Richard Coles) <torne@google.com> | 2014-08-28 12:05:23 +0100 |
commit | 03b57e008b61dfcb1fbad3aea950ae0e001748b0 (patch) | |
tree | 9a740c1a5fbe659ec83484b67cbc679332f5a408 /gpu/gpu.gyp | |
parent | ca7d0c81aa30d24514c34c963f43cd24da34a2bf (diff) | |
download | chromium_org-03b57e008b61dfcb1fbad3aea950ae0e001748b0.tar.gz |
Merge from Chromium at DEPS revision 291560
This commit was generated by merge_to_master.py.
Change-Id: Ic58269055810d51286b4109e59b90b6856887a30
Diffstat (limited to 'gpu/gpu.gyp')
-rw-r--r-- | gpu/gpu.gyp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp index 294f436e68..27923dc505 100644 --- a/gpu/gpu.gyp +++ b/gpu/gpu.gyp @@ -246,6 +246,8 @@ '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_extensions.cc', + 'command_buffer/service/gles2_cmd_decoder_unittest_extensions_autogen.h', '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', |