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

Unified Diff: gpu/gpu.gyp

Issue 1680743007: Revert of command_buffer_gles2: Add test command_buffer_gles2_test for command_buffer_gles2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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/egl/test_support.cc ('k') | no next file » | 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 8e14dfd93ab686a8cda446b9070c422ea74acf6e..25487b0979a763bd2610f8296b0bb71fb01aa346 100644
--- a/gpu/gpu.gyp
+++ b/gpu/gpu.gyp
@@ -437,8 +437,6 @@
'gles2_conform_support/egl/egl.cc',
'gles2_conform_support/egl/surface.cc',
'gles2_conform_support/egl/surface.h',
- 'gles2_conform_support/egl/test_support.cc',
- 'gles2_conform_support/egl/test_support.h',
],
'conditions': [
['OS=="win"', {
@@ -455,37 +453,7 @@
],
}, ],
],
- },
- {
- # GN version: //gpu:command_buffer_gles2_tests
- 'target_name': 'command_buffer_gles2_tests',
- 'type': '<(gtest_target_type)',
- 'dependencies': [
- '../base/base.gyp:base',
- '../base/base.gyp:test_support_base',
- '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
- '../testing/gmock.gyp:gmock',
- '../testing/gtest.gyp:gtest',
- 'command_buffer_gles2',
- ],
- 'sources': [
- # Note: sources list duplicated in GN build.
- 'command_buffer/tests/command_buffer_gles2_tests_main.cc',
- 'command_buffer/tests/egl_test.cc',
- ],
- 'defines': [
- 'COMMAND_BUFFER_GLES_LIB_SUPPORT_ONLY',
- 'EGLAPIENTRY=',
- 'EGLAPI='
- ],
- 'conditions': [
- ['OS == "android"', {
- 'dependencies': [
- '../testing/android/native_test.gyp:native_test_native_code',
- ],
- }],
- ],
- },
+ }
],
'conditions': [
['component=="static_library"', {
@@ -785,19 +753,6 @@
},
'includes': [ '../build/apk_test.gypi' ],
},
- {
- 'target_name': 'command_buffer_gles2_tests_apk',
- 'type': 'none',
- 'dependencies': [
- 'command_buffer_gles2_tests',
- ],
- 'variables': {
- 'test_suite_name': 'command_buffer_gles2_tests',
- },
- 'includes': [
- '../build/apk_test.gypi',
- ],
- },
],
}],
['OS == "win" or (OS == "linux" and use_x11==1) or OS == "mac"', {
@@ -924,19 +879,6 @@
['OS == "android" and test_isolation_mode != "noop"',
{
'targets': [
- {
- 'target_name': 'command_buffer_gles2_tests_apk_run',
- 'type': 'none',
- 'dependencies': [
- 'command_buffer_gles2_tests_apk',
- ],
- 'includes': [
- '../build/isolate.gypi',
- ],
- 'sources': [
- 'command_buffer_gles2_apk.isolate',
- ],
- },
{
'target_name': 'gl_tests_apk_run',
'type': 'none',
« no previous file with comments | « gpu/gles2_conform_support/egl/test_support.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698