diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-12 07:00:15 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-12 07:00:15 +0000 |
| commit | a4aeea0acfd739c4434287bfbb928544684c3554 (patch) | |
| tree | 0d7492fad19ec6763dd13b1862f7c1ff52f72ccd /chrome/nacl.gypi | |
| parent | bc2e3f3dbcbd308f2efeca56a7e73e20376aafb3 (diff) | |
| download | chromium_src-a4aeea0acfd739c4434287bfbb928544684c3554.zip chromium_src-a4aeea0acfd739c4434287bfbb928544684c3554.tar.gz chromium_src-a4aeea0acfd739c4434287bfbb928544684c3554.tar.bz2 | |
Make it possible to build DRT in a chromium checkout.
The problem was the circular gyp dependency between webkit.gyp
and WebKit.gyp:
webkit.gyp:pull_in_webkit_unit_tests -> WebKit.gyp -> webkit.gyp:webkit_support.
The fix is to move webkit_support into its own gyp file (like we do
in an webkit only checkout). We can't use the same gyp file for in-
chromium and in-webkit because we need to change the include path for
features.gypi. In gyp, variable expansion happens after includes
(otherwise you'd have to expand variables twice and they could change
values), so we can't use a single gyp file for this.
Review URL: http://codereview.chromium.org/1995013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47012 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/nacl.gypi')
| -rw-r--r-- | chrome/nacl.gypi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/nacl.gypi b/chrome/nacl.gypi index b8b932d..2d73a123 100644 --- a/chrome/nacl.gypi +++ b/chrome/nacl.gypi @@ -69,7 +69,7 @@ 'chrome_strings', 'common', '../third_party/npapi/npapi.gyp:npapi', - '../webkit/webkit.gyp:glue', + '../webkit/support/webkit_support_in_chromium.gyp:glue', '../native_client/src/trusted/plugin/plugin.gyp:npGoogleNaClPluginChrome', '../native_client/src/trusted/service_runtime/service_runtime.gyp:sel', '../native_client/src/trusted/validator_x86/validator_x86.gyp:ncvalidate', |