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

Unified Diff: WebCore/WebCore.gyp/WebCore.gyp

Issue 3225004: Move all the remaining dependencies in webcore_remaining into webcore_prerequisites (Closed) Base URL: git://git.webkit.org/WebKit.git
Patch Set: diff against http://codereview.chromium.org/3223009 Created 10 years, 4 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
« no previous file with comments | « WebCore/ChangeLog ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: WebCore/WebCore.gyp/WebCore.gyp
diff --git a/WebCore/WebCore.gyp/WebCore.gyp b/WebCore/WebCore.gyp/WebCore.gyp
index 56045db5b981b1296b82c8a12ec7a2d92559dbce..6b70c1d195a6785e30cedc19621359492c815a77 100644
--- a/WebCore/WebCore.gyp/WebCore.gyp
+++ b/WebCore/WebCore.gyp/WebCore.gyp
@@ -872,6 +872,12 @@
},
'conditions': [
['javascript_engine=="v8"', {
+ 'dependencies': [
+ '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
+ ],
+ 'export_dependent_settings': [
+ '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
+ ],
'conditions': [
['inside_chromium_build==1 and OS=="win" and component=="shared_library"', {
'defines': [
@@ -880,7 +886,23 @@
}],
],
}],
+ ['use_accelerated_compositing==1', {
+ 'dependencies': [
+ '<(chromium_src_dir)/gpu/gpu.gyp:gles2_c_lib',
+ ],
+ 'export_dependent_settings': [
+ '<(chromium_src_dir)/gpu/gpu.gyp:gles2_c_lib',
+ ],
+ }],
['OS=="linux" or OS=="freebsd"', {
+ 'dependencies': [
+ '<(chromium_src_dir)/build/linux/system.gyp:fontconfig',
+ '<(chromium_src_dir)/build/linux/system.gyp:gtk',
+ ],
+ 'export_dependent_settings': [
+ '<(chromium_src_dir)/build/linux/system.gyp:fontconfig',
+ '<(chromium_src_dir)/build/linux/system.gyp:gtk',
+ ],
'cflags': [
# WebCore does not work with strict aliasing enabled.
# https://bugs.webkit.org/show_bug.cgi?id=25864
@@ -897,6 +919,12 @@
],
}],
['OS=="mac"', {
+ 'dependencies': [
+ 'webkit_system_interface',
+ ],
+ 'export_dependent_settings': [
+ 'webkit_system_interface',
+ ],
'defines': [
# Match Safari and Mozilla on Mac x86.
'WEBCORE_NAVIGATOR_PLATFORM="MacIntel"',
@@ -927,6 +955,12 @@
],
}],
['OS=="win"', {
+ 'dependencies': [
+ '<(chromium_src_dir)/build/win/system.gyp:cygwin'
+ ],
+ 'export_dependent_settings': [
+ '<(chromium_src_dir)/build/win/system.gyp:cygwin'
+ ],
'defines': [
# Match Safari and Mozilla on Windows.
'WEBCORE_NAVIGATOR_PLATFORM="Win32"',
@@ -1076,11 +1110,6 @@
],
},
'conditions': [
- ['javascript_engine=="v8"', {
- 'dependencies': [
- '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
- ],
- }],
['enable_svg!=0', {
'sources/': [
['exclude', 'svg/[^/]+\\.cpp$'],
@@ -1095,16 +1124,7 @@
['exclude', 'rendering/SVG'],
],
}],
- ['use_accelerated_compositing==1', {
- 'dependencies': [
- '<(chromium_src_dir)/gpu/gpu.gyp:gles2_c_lib',
- ],
- }],
['OS=="linux" or OS=="freebsd"', {
- 'dependencies': [
- '<(chromium_src_dir)/build/linux/system.gyp:fontconfig',
- '<(chromium_src_dir)/build/linux/system.gyp:gtk',
- ],
'sources': [
'../platform/graphics/chromium/VDMXParser.cpp',
'../platform/graphics/chromium/HarfbuzzSkia.cpp',
@@ -1247,9 +1267,6 @@
],
}],
['OS=="win"', {
- 'dependencies': [
- '<(chromium_src_dir)/build/win/system.gyp:cygwin'
- ],
'sources/': [
['exclude', 'Posix\\.cpp$'],
['include', '/opentype/'],
« no previous file with comments | « WebCore/ChangeLog ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698