diff options
| author | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-17 06:50:01 +0000 |
|---|---|---|
| committer | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-17 06:50:01 +0000 |
| commit | c1d9cdcb2aa753686fb29f3c5f42f710acf49782 (patch) | |
| tree | 9230c8ca02e0607cec3bfeb4ed1c945e4163bc84 /webkit/glue/webkit_glue.gypi | |
| parent | 8bd0fe6f88b7f6f1cc8c7b7c4c2474669d8d6d60 (diff) | |
| download | chromium_src-c1d9cdcb2aa753686fb29f3c5f42f710acf49782.zip chromium_src-c1d9cdcb2aa753686fb29f3c5f42f710acf49782.tar.gz chromium_src-c1d9cdcb2aa753686fb29f3c5f42f710acf49782.tar.bz2 | |
Roll WebKit DEPS past WebKit move. Update gyp files and include paths to reflect the move. Consolidate how we DEPS in WebKit source files. Cross fingers.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71586 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webkit_glue.gypi')
| -rw-r--r-- | webkit/glue/webkit_glue.gypi | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi index ceef497..b6a8c6a 100644 --- a/webkit/glue/webkit_glue.gypi +++ b/webkit/glue/webkit_glue.gypi @@ -6,7 +6,7 @@ 'variables': { 'conditions': [ ['inside_chromium_build==0', { - 'webkit_src_dir': '../../../..', + 'webkit_src_dir': '../../../../..', },{ 'webkit_src_dir': '../../third_party/WebKit', }], @@ -45,7 +45,7 @@ { 'action_name': 'webkit_chromium_resources', 'variables': { - 'input_path': '<(webkit_src_dir)/WebKit/chromium/WebKit.grd', + 'input_path': '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.grd', }, 'inputs': [ '<!@(<(grit_info_cmd) --inputs <(input_path))', @@ -512,11 +512,11 @@ 'conditions': [ ['inside_chromium_build==1 and component=="shared_library"', { 'dependencies': [ - '<(DEPTH)/third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit', + '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', ], 'export_dependent_settings': [ - '<(DEPTH)/third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit', + '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', ], }], |