diff options
| author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-30 22:24:28 +0000 |
|---|---|---|
| committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-30 22:24:28 +0000 |
| commit | eb64f833fea0c6a38b16c0dcd860332a9d231d7a (patch) | |
| tree | 7c3e5b86a8f206f71fc0b494b603cf3482ecb152 /webkit | |
| parent | 9ec3e3f431967c21cd5904785ec8b7541d6096d1 (diff) | |
| download | chromium_src-eb64f833fea0c6a38b16c0dcd860332a9d231d7a.zip chromium_src-eb64f833fea0c6a38b16c0dcd860332a9d231d7a.tar.gz chromium_src-eb64f833fea0c6a38b16c0dcd860332a9d231d7a.tar.bz2 | |
update dependencies in preparation for glue being a component
R=darin@chromium.org
BUG=98755
TEST=waterfall stays green
Review URL: http://codereview.chromium.org/8741002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112309 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/blob/webkit_blob.gypi | 17 | ||||
| -rw-r--r-- | webkit/glue/webkit_glue.gypi | 5 |
2 files changed, 22 insertions, 0 deletions
diff --git a/webkit/blob/webkit_blob.gypi b/webkit/blob/webkit_blob.gypi index 57769b8..2acc390 100644 --- a/webkit/blob/webkit_blob.gypi +++ b/webkit/blob/webkit_blob.gypi @@ -3,6 +3,15 @@ # found in the LICENSE file. { + 'variables': { + 'conditions': [ + ['inside_chromium_build==0', { + 'webkit_src_dir': '../../../../..', + },{ + 'webkit_src_dir': '../../third_party/WebKit', + }], + ], + }, 'targets': [ { 'target_name': 'blob', @@ -45,6 +54,14 @@ '<(DEPTH)/webkit/support/webkit_support.gyp:glue', ], }], + [# TODO(dpranke): Remove once the circular dependencies in + # WebKit.gyp are fixed on the mac. + # See https://bugs.webkit.org/show_bug.cgi?id=68463 + 'OS!="mac"', { + 'dependencies': [ + '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', + ], + }], ], }, ], diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi index 7cc1a45..0c48a54 100644 --- a/webkit/glue/webkit_glue.gypi +++ b/webkit/glue/webkit_glue.gypi @@ -111,8 +111,11 @@ 'dependencies': [ '<(DEPTH)/base/base.gyp:base_i18n', '<(DEPTH)/base/base.gyp:base_static', + '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl', + '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib', '<(DEPTH)/gpu/gpu.gyp:gles2_implementation', + '<(DEPTH)/media/media.gyp:media', '<(DEPTH)/net/net.gyp:net', '<(DEPTH)/ppapi/ppapi.gyp:ppapi_c', '<(DEPTH)/ppapi/ppapi_internal.gyp:ppapi_shared', @@ -123,6 +126,8 @@ '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', '<(DEPTH)/ui/ui.gyp:ui', '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', + 'fileapi', + 'webkit_media', 'webkit_resources', 'webkit_strings', 'webkit_user_agent', |