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 --- gpu/command_buffer_service.gypi | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'gpu/command_buffer_service.gypi') diff --git a/gpu/command_buffer_service.gypi b/gpu/command_buffer_service.gypi index e541999..ae62938 100644 --- a/gpu/command_buffer_service.gypi +++ b/gpu/command_buffer_service.gypi @@ -18,6 +18,7 @@ '../ui/gfx/gfx.gyp:gfx', '../ui/gl/gl.gyp:gl', '../ui/ui.gyp:ui', + '../third_party/angle_dx11/src/build_angle.gyp:translator', '../third_party/khronos/khronos.gyp:khronos_headers', '../third_party/protobuf/protobuf.gyp:protobuf_lite', '../third_party/smhasher/smhasher.gyp:cityhash', @@ -140,15 +141,6 @@ '../third_party/khronos', ], }], - ['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', - ], - }], ['OS in ("win", "android") or (OS == "linux" and use_x11 == 1)', { 'sources': [ 'command_buffer/service/async_pixel_transfer_manager_egl.cc', -- cgit v1.1