Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1164)

Unified Diff: Source/platform/blink_platform.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:
View side-by-side diff with in-line comments
Download patch
Index: Source/platform/blink_platform.gyp
diff --git a/Source/platform/blink_platform.gyp b/Source/platform/blink_platform.gyp
index 199fe6df96b9dd165a921599c2880c35ee7f6a85..cc11617a8fe5a25af924240d56cb717ff459f2b4 100644
--- a/Source/platform/blink_platform.gyp
+++ b/Source/platform/blink_platform.gyp
@@ -64,15 +64,26 @@
'../wtf/wtf.gyp:wtf',
'../weborigin/weborigin.gyp:weborigin',
'<(DEPTH)/skia/skia.gyp:skia',
+ # FIXME: This dependency exists for CSS Custom Filters, via the file ANGLEPlatformBridge
+ # The code touching ANGLE should really be moved into the ANGLE directory.
+ '<(DEPTH)/third_party/angle_dx11/src/build_angle.gyp:translator',
'<(DEPTH)/url/url.gyp:url_lib',
'<(DEPTH)/third_party/icu/icu.gyp:icui18n',
'<(DEPTH)/third_party/icu/icu.gyp:icuuc',
'blink_common',
],
+ 'export_dependent_settings': [
+ # FIXME: This dependency exists for CSS Custom Filters, via the file ANGLEPlatformBridge
+ # The code touching ANGLE should really be moved into the ANGLE directory.
+ '<(DEPTH)/third_party/angle_dx11/src/build_angle.gyp:translator',
+ ],
'defines': [
'BLINK_PLATFORM_IMPLEMENTATION=1',
'INSIDE_BLINK',
],
+ 'include_dirs': [
+ '<(DEPTH)/third_party/angle_dx11/include',
+ ],
'sources': [
'<@(platform_files)',
],
« no previous file with comments | « Source/core/platform/graphics/filters/custom/CustomFilterValidatedProgram.cpp ('k') | Source/platform/blink_platform.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698