gpu/gles2_conform_support/gles2_conform_test.gyp - Issue 614053003: Replace build_angle.gyp with angle.gyp.

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/gles2_conform_support/gles2_conform_test.gyp

Issue 614053003: Replace build_angle.gyp with angle.gyp. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 3 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/gles2_conform_support/gles2_conform_test.gyp

diff --git a/gpu/gles2_conform_support/gles2_conform_test.gyp b/gpu/gles2_conform_support/gles2_conform_test.gyp

index 2faf841d9f4df6342723779091860719a06a33db..4cbb35b3daaf6415b308dababebcced7851498c8 100644

--- a/gpu/gles2_conform_support/gles2_conform_test.gyp

+++ b/gpu/gles2_conform_support/gles2_conform_test.gyp

@@ -126,8 +126,8 @@

}],

['OS=="win"', {

'dependencies': [

- '<(angle_path)/src/build_angle.gyp:libGLESv2',

- '<(angle_path)/src/build_angle.gyp:libEGL',

+ '<(angle_path)/src/angle.gyp:libGLESv2',

+ '<(angle_path)/src/angle.gyp:libEGL',

'defines': [

'EGLAPI=',

@@ -210,8 +210,8 @@

'gles2_conform_test_embedded_data',

'<(DEPTH)/base/base.gyp:base',

'<(DEPTH)/third_party/expat/expat.gyp:expat',

- '<(angle_path)/src/build_angle.gyp:libGLESv2',

- '<(angle_path)/src/build_angle.gyp:libEGL',

+ '<(angle_path)/src/angle.gyp:libGLESv2',

+ '<(angle_path)/src/angle.gyp:libEGL',

'<(DEPTH)/gpu/gles2_conform_support/gles2_conform_support.gyp:egl_main_native',

'defines': [

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