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

Unified Diff: cc/cc.gyp

Issue 10909145: Fix cc gyp files up for static linking (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | cc/cc_tests.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/cc.gyp
diff --git a/cc/cc.gyp b/cc/cc.gyp
index 59a247a0fa75cd1e1563b406b51ad8e099725c6c..050127e9762659d3f39ce30e4057019194f6cda8 100644
--- a/cc/cc.gyp
+++ b/cc/cc.gyp
@@ -209,6 +209,13 @@
'VideoLayerChromium.cpp',
'VideoLayerChromium.h',
],
+ 'conditions': [
+ ['inside_chromium_build==0', {
+ 'webkit_src_dir': '../../../..',
+ },{
+ 'webkit_src_dir': '../third_party/WebKit',
+ }],
+ ],
},
'targets': [
{
@@ -220,17 +227,18 @@
'<(DEPTH)/base/base.gyp:base',
'<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'<(DEPTH)/skia/skia.gyp:skia',
- '<(DEPTH)/third_party/WebKit/Source/Platform/Platform.gyp/Platform.gyp:webkit_platform',
- # We have to depend on WTF directly to pick up the correct defines for WTF headers - for instance USE_SYSTEM_MALLOC.
- '<(DEPTH)/third_party/WebKit/Source/WTF/WTF.gyp/WTF.gyp:wtf',
'<(DEPTH)/ui/gl/gl.gyp:gl',
'<(DEPTH)/ui/ui.gyp:ui',
+ '<(webkit_src_dir)/Source/WTF/WTF.gyp/WTF.gyp:wtf',
+ '<(webkit_src_dir)/Source/WebCore/WebCore.gyp/WebCore.gyp:webcore_platform_geometry',
+ '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit_wtf_support',
],
'defines': [
'WTF_USE_ACCELERATED_COMPOSITING=1',
],
'include_dirs': [
'stubs',
+ '<(webkit_src_dir)/Source/Platform/chromium',
],
'sources': [
'<@(cc_source_files)',
« no previous file with comments | « no previous file | cc/cc_tests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698