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 /net/net.gyp | |
| 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 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/net.gyp b/net/net.gyp index eab929a..a377e9c 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -16,7 +16,6 @@ 'dependencies': [ '../base/base.gyp:base', '../build/temp_gyp/googleurl.gyp:googleurl', - '../build/temp_gyp/v8.gyp:v8', '../sdch/sdch.gyp:sdch', # TODO: various targets end up using # testing::internal::AssertHelper through references here. @@ -313,6 +312,11 @@ '../base/base.gyp:base', ], 'conditions': [ + ['javascript_engine=="v8"', { + 'dependencies': [ + '../build/temp_gyp/v8.gyp:v8', + ], + }], [ 'OS == "linux"', { 'dependencies': [ '../build/linux/system.gyp:gconf', |