From c61f6435bb1b0b4637538aadc490648e6b1293b2 Mon Sep 17 00:00:00 2001 From: "sgk@google.com" Date: Wed, 22 Apr 2009 01:16:42 +0000 Subject: 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 --- build/all.gyp | 6 +++++- build/common.gypi | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'build') 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 -- cgit v1.1