diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-22 01:16:42 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-22 01:16:42 +0000 |
| commit | c61f6435bb1b0b4637538aadc490648e6b1293b2 (patch) | |
| tree | a44b2bd5f60de3d34b881f2d0f4c108bfb94a501 /webkit | |
| parent | ec8a0ab05c4da76c0eaabc340f3f3a374b7e0f58 (diff) | |
| download | chromium_src-c61f6435bb1b0b4637538aadc490648e6b1293b2.zip chromium_src-c61f6435bb1b0b4637538aadc490648e6b1293b2.tar.gz chromium_src-c61f6435bb1b0b4637538aadc490648e6b1293b2.tar.bz2 | |
Add -DCHROME_V8 to the chrome/browser build.
Add a 'javascript_engine' variable to control that setting
(as well as whether we use v8.gyp at all).
Review URL: http://codereview.chromium.org/88070
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14171 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/webkit.gyp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index dd52f0a..f2bf19e2 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -437,7 +437,6 @@ '../third_party/libxslt/libxslt.gyp:libxslt', '../third_party/npapi/npapi.gyp:npapi', '../third_party/sqlite/sqlite.gyp:sqlite', - '../build/temp_gyp/v8.gyp:v8', ], 'actions': [ # Actions to build derived sources. @@ -3936,7 +3935,6 @@ '../build/temp_gyp/googleurl.gyp:googleurl', '../skia/skia.gyp:skia', '../third_party/npapi/npapi.gyp:npapi', - '../build/temp_gyp/v8.gyp:v8', ], 'link_settings': { 'mac_bundle_resources': [ @@ -3986,6 +3984,14 @@ 'GCC_PREFIX_HEADER': '../third_party/WebKit/WebCore/WebCorePrefix.h', }, 'conditions': [ + ['javascript_engine=="v8"', { + 'dependencies': [ + '../build/temp_gyp/v8.gyp:v8', + ], + 'export_dependent_settings': [ + '../build/temp_gyp/v8.gyp:v8', + ], + }], ['OS=="linux"', { 'dependencies': [ '../build/linux/system.gyp:gtk', |