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 /build | |
| 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 'build')
| -rw-r--r-- | build/all.gyp | 8 | ||||
| -rw-r--r-- | build/features_override.gypi | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/build/all.gyp b/build/all.gyp index 212c6c9..36c9216 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -44,7 +44,7 @@ '../third_party/ots/ots.gyp:*', '../third_party/qcms/qcms.gyp:*', '../third_party/sqlite/sqlite.gyp:*', - '../third_party/WebKit/WebKit/chromium/WebKit.gyp:*', + '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:*', '../third_party/zlib/zlib.gyp:*', '../webkit/support/webkit_support.gyp:*', '../webkit/webkit.gyp:*', @@ -188,7 +188,7 @@ '../sandbox/sandbox.gyp:sbox_unittests', '../sandbox/sandbox.gyp:sbox_validation_tests', '../views/views.gyp:views_unittests', - '../third_party/WebKit/WebKit/chromium/WebKit.gyp:copy_TestNetscapePlugIn', + '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:copy_TestNetscapePlugIn', # TODO(nsylvain) ui_tests.exe depends on test_shell_common. # This should: # 1) not be the case. OR. @@ -203,7 +203,7 @@ 'type': 'none', 'dependencies': [ '../chrome/chrome.gyp:gpu_tests', - '../third_party/WebKit/WebKit/chromium/WebKit.gyp:DumpRenderTree', + '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:DumpRenderTree', ], } ], @@ -353,7 +353,7 @@ '../printing/printing.gyp:printing_unittests', '../remoting/remoting.gyp:remoting_unittests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', - '../third_party/WebKit/WebKit/chromium/WebKit.gyp:copy_TestNetscapePlugIn', + '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:copy_TestNetscapePlugIn', # TODO(nsylvain) ui_tests.exe depends on test_shell_common. # This should: # 1) not be the case. OR. diff --git a/build/features_override.gypi b/build/features_override.gypi index 770778d..eb7c29d 100644 --- a/build/features_override.gypi +++ b/build/features_override.gypi @@ -3,7 +3,8 @@ # found in the LICENSE file. # This file is only included in full-chromium builds, and overrides the -# feature_defines variable in third_party/WebKit/WebKit/chromium/features.gypi. +# feature_defines variable in +# third_party/WebKit/Source/WebKit/chromium/features.gypi. { 'variables': { # WARNING: This list of strings completely replaces the list in |