summaryrefslogtreecommitdiffstats
path: root/webkit/glue
diff options
context:
space:
mode:
authorvictorw@chromium.org <victorw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-16 05:44:08 +0000
committervictorw@chromium.org <victorw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-16 05:44:08 +0000
commitac6f515cc2c6c229b9e5612b68107e6213e63514 (patch)
treed7ab6a0ce5352385e7f6bf6f04f0a066d0157414 /webkit/glue
parent838eb9df8b2796d968b884d81eece35e5dae8f87 (diff)
downloadchromium_src-ac6f515cc2c6c229b9e5612b68107e6213e63514.zip
chromium_src-ac6f515cc2c6c229b9e5612b68107e6213e63514.tar.gz
chromium_src-ac6f515cc2c6c229b9e5612b68107e6213e63514.tar.bz2
Update gyp for chromium multi dll build
BUG=46311 TEST=none Review URL: http://codereview.chromium.org/2962012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52614 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
-rw-r--r--webkit/glue/webkit_glue.gypi8
1 files changed, 8 insertions, 0 deletions
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index c1a467a..3c4b3e3 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -395,6 +395,14 @@
'sources!': [
'plugins/plugin_stubs.cc',
],
+ 'conditions': [
+ ['inside_chromium_build==1 and component=="shared_library"', {
+ 'dependencies': [
+ '<(DEPTH)/third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit',
+ '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
+ ],
+ }],
+ ],
}],
['inside_chromium_build==0', {
'dependencies': [