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 /build | |
| 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 'build')
| -rw-r--r-- | build/all.gyp | 6 | ||||
| -rw-r--r-- | build/common.gypi | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/build/all.gyp b/build/all.gyp index feec2e3..cb3e454 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -39,9 +39,13 @@ '../third_party/sqlite/sqlite.gyp:*', '../third_party/zlib/zlib.gyp:*', 'temp_gyp/googleurl.gyp:*', - 'temp_gyp/v8.gyp:*', ], 'conditions': [ + ['javascript_engine=="v8"', { + 'dependencies': [ + 'temp_gyp/v8.gyp:*', + ], + }], ['OS=="linux"', { 'dependencies': [ '../third_party/harfbuzz/harfbuzz.gyp:*', diff --git a/build/common.gypi b/build/common.gypi index 2c7dde2..e9205c8 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -32,6 +32,10 @@ # Currently ignored on Windows. 'coverage%': 0, + # Overridable specification for potential use of alternative + # JavaScript engines. + 'javascript_engine%': 'v8', + # To do a shared build on linux we need to be able to choose between type # static_library and shared_library. We default to doing a static build # but you can override this with "gyp -Dlibrary=shared_library" or you |