Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2807)

Unified Diff: gpu/gpu.gyp

Issue 1001833005: Update from https://crrev.com/320343 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Supress Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/gles2_conform_support/native/BUILD.gn ('k') | gpu/gpu_unittests.isolate » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/gpu.gyp
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp
index 2bb746554b2100c304b497500260230e26117f9d..0e31fb04b844cd631ca3d0271883d3bf5da316b4 100644
--- a/gpu/gpu.gyp
+++ b/gpu/gpu.gyp
@@ -103,6 +103,7 @@
'msvs_disabled_warnings': [4267, ],
},
{
+ # GN version: //gpu/command_buffer/client:gles2_c_lib_nocheck
# Same as gles2_c_lib except with no parameter checking. Required for
# OpenGL ES 2.0 conformance tests.
'target_name': 'gles2_c_lib_nocheck',
@@ -220,6 +221,7 @@
'command_buffer/service/gles2_cmd_decoder_unittest_attribs.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_buffers.cc',
'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',
@@ -287,6 +289,7 @@
'dependencies': [
'../base/base.gyp:base',
'../base/base.gyp:test_support_base',
+ '../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'../testing/perf/perf_test.gyp:perf_test',
'../ui/gfx/gfx.gyp:gfx_geometry',
« no previous file with comments | « gpu/gles2_conform_support/native/BUILD.gn ('k') | gpu/gpu_unittests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698