From 1ec852c10048bad2614c714df22c288ec541553f Mon Sep 17 00:00:00 2001 From: "zmo@chromium.org" Date: Mon, 7 Oct 2013 22:57:01 +0000 Subject: Remove the use_angle_translator condition. We retired translator_glsl already, so we always use translator. This is a revertion of https://codereview.chromium.org/25351004/. BUG= TEST=tree TBR=jamesr Review URL: https://codereview.chromium.org/26315004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227372 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/common/gpu/webkit_gpu.gyp | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'webkit/common') diff --git a/webkit/common/gpu/webkit_gpu.gyp b/webkit/common/gpu/webkit_gpu.gyp index d85e478..86f7e43 100644 --- a/webkit/common/gpu/webkit_gpu.gyp +++ b/webkit/common/gpu/webkit_gpu.gyp @@ -23,6 +23,7 @@ '<(DEPTH)/gpu/gpu.gyp:gles2_implementation', '<(DEPTH)/skia/skia.gyp:skia', '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink_minimal', + '<(DEPTH)/third_party/angle_dx11/src/build_angle.gyp:translator', '<(DEPTH)/ui/gl/gl.gyp:gl', '<(DEPTH)/ui/gfx/gfx.gyp:gfx', '<(DEPTH)/ui/ui.gyp:ui', @@ -47,17 +48,6 @@ 'defines': [ 'WEBKIT_GPU_IMPLEMENTATION', ], - 'conditions': [ - ['use_angle_translator==1', { - 'dependencies': [ - '<(DEPTH)/third_party/angle_dx11/src/build_angle.gyp:translator', - ], - }, { - 'dependencies': [ - '<(DEPTH)/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, ], }, -- cgit v1.1