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

Unified Diff: gpu/gpu.gyp

Issue 26315004: Remove the use_angle_translator condition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 2 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/command_buffer_service.gypi ('k') | webkit/common/gpu/webkit_gpu.gyp » ('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 8fef21de55414988114c295bcaffdb41e62de87b..fd7cac88cd2ea0097387dbce825a7e1cb0688467 100644
--- a/gpu/gpu.gyp
+++ b/gpu/gpu.gyp
@@ -126,6 +126,7 @@
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
+ '../third_party/angle_dx11/src/build_angle.gyp:translator',
'../ui/gl/gl.gyp:gl',
'../ui/gfx/gfx.gyp:gfx',
'command_buffer/command_buffer.gyp:gles2_utils',
@@ -240,15 +241,6 @@
'../base/allocator/allocator.gyp:allocator',
],
}],
- ['use_angle_translator==1', {
- 'dependencies': [
- '../third_party/angle_dx11/src/build_angle.gyp:translator',
- ],
- }, {
- 'dependencies': [
- '../third_party/angle_dx11/src/build_angle.gyp:translator_glsl',
- ],
- }],
],
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
'msvs_disabled_warnings': [ 4267, ],
@@ -261,6 +253,7 @@
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
+ '../third_party/angle_dx11/src/build_angle.gyp:translator',
'../ui/gfx/gfx.gyp:gfx',
'command_buffer/command_buffer.gyp:gles2_utils',
'command_buffer_client',
@@ -309,15 +302,6 @@
'../testing/android/native_test.gyp:native_test_native_code',
],
}],
- ['use_angle_translator==1', {
- 'dependencies': [
- '../third_party/angle_dx11/src/build_angle.gyp:translator',
- ],
- }, {
- 'dependencies': [
- '../third_party/angle_dx11/src/build_angle.gyp:translator_glsl',
- ],
- }],
],
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
'msvs_disabled_warnings': [ 4267, ],
« no previous file with comments | « gpu/command_buffer_service.gypi ('k') | webkit/common/gpu/webkit_gpu.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698