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

Unified Diff: gpu/gpu.gyp

Issue 25351004: Use translator instead of translator_glsl ANGLE dependency. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add a condition 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 51122cd970cbf4b76fc3b7fb9f9e89acb61e9fd9..8fef21de55414988114c295bcaffdb41e62de87b 100644
--- a/gpu/gpu.gyp
+++ b/gpu/gpu.gyp
@@ -126,7 +126,6 @@
'../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_glsl',
'../ui/gl/gl.gyp:gl',
'../ui/gfx/gfx.gyp:gfx',
'command_buffer/command_buffer.gyp:gles2_utils',
@@ -241,6 +240,15 @@
'../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, ],
@@ -253,7 +261,6 @@
'../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_glsl',
'../ui/gfx/gfx.gyp:gfx',
'command_buffer/command_buffer.gyp:gles2_utils',
'command_buffer_client',
@@ -302,6 +309,15 @@
'../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