gpu/command_buffer_service.gypi - Issue 25351004: Use translator instead of translator_glsl ANGLE dependency.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: gpu/command_buffer_service.gypi

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:

Index: gpu/command_buffer_service.gypi

diff --git a/gpu/command_buffer_service.gypi b/gpu/command_buffer_service.gypi

index 5a7f6fbea8e83eaf9e271e7154ffc3d6c9c7c614..e541999aa65c946fc49fa82a6a77b90a29df0f6b 100644

--- a/gpu/command_buffer_service.gypi

+++ b/gpu/command_buffer_service.gypi

@@ -18,7 +18,6 @@

'../ui/gfx/gfx.gyp:gfx',

'../ui/gl/gl.gyp:gl',

'../ui/ui.gyp:ui',

- '../third_party/angle_dx11/src/build_angle.gyp:translator_glsl',

'../third_party/khronos/khronos.gyp:khronos_headers',

'../third_party/protobuf/protobuf.gyp:protobuf_lite',

'../third_party/smhasher/smhasher.gyp:cityhash',

@@ -141,6 +140,15 @@

'../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',

« no previous file with comments | « build/common.gypi ('k') | gpu/gpu.gyp » ('j') | no next file with comments »