diff options
| -rw-r--r-- | build/all.gyp | 6 | ||||
| -rw-r--r-- | build/common.gypi | 4 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 5 | ||||
| -rw-r--r-- | net/net.gyp | 6 | ||||
| -rw-r--r-- | webkit/webkit.gyp | 10 |
5 files changed, 27 insertions, 4 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 diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index f71c50a..3ab1df3 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1313,6 +1313,11 @@ 'browser/worker_host/worker_service.h', ], 'conditions': [ + ['javascript_engine=="v8"', { + 'defines': [ + 'CHROME_V8', + ], + }], ['OS=="linux"', { 'dependencies': [ '../build/linux/system.gyp:gtk', 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', 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', |