Source/core/core.gyp - Issue 25825003: Move ANGLEWebKitBridge to platform/graphics/angle/ANGLEPlatformBridge.

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: Source/core/core.gyp

Issue 25825003: Move ANGLEWebKitBridge to platform/graphics/angle/ANGLEPlatformBridge. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Fixed bad merge 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: Source/core/core.gyp

diff --git a/Source/core/core.gyp b/Source/core/core.gyp

index ffadcab145b5c81b3dc2af30edd330dbba994096..11f849780545f0ce60fcd622ae6cf8496caca876 100644

--- a/Source/core/core.gyp

+++ b/Source/core/core.gyp

@@ -397,7 +397,7 @@

'include_dirs': [

'<@(webcore_include_dirs)',

'<(DEPTH)/gpu',

- '<(DEPTH)/third_party/angle_dx11/include/GLSLANG',

+ '<(DEPTH)/third_party/angle_dx11/include',

'msvs_disabled_warnings': [

4138, 4244, 4291, 4305, 4344, 4355, 4521, 4099,

« no previous file with comments | « no previous file | Source/core/core.gypi » ('j') | no next file with comments »