diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-07-14 17:41:05 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-08-04 12:37:36 +0000 |
| commit | 399c965b6064c440ddcf4015f5f8e9d131c7a0a6 (patch) | |
| tree | 6b06b60ff365abef0e13b3503d593a0df48d20e8 /chromium/v8/samples | |
| parent | 7366110654eec46f21b6824f302356426f48cd74 (diff) | |
| download | qtwebengine-chromium-399c965b6064c440ddcf4015f5f8e9d131c7a0a6.tar.gz | |
BASELINE: Update Chromium to 52.0.2743.76 and Ninja to 1.7.1
Change-Id: I382f51b959689505a60f8b707255ecb344f7d8b4
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/v8/samples')
| -rw-r--r-- | chromium/v8/samples/samples.gyp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/chromium/v8/samples/samples.gyp b/chromium/v8/samples/samples.gyp index 7e0608b2130..e5e9ef0f8cc 100644 --- a/chromium/v8/samples/samples.gyp +++ b/chromium/v8/samples/samples.gyp @@ -29,13 +29,14 @@ 'variables': { 'v8_code': 1, 'v8_enable_i18n_support%': 1, + 'v8_toolset_for_shell%': 'target', }, - 'includes': ['../build/toolchain.gypi', '../build/features.gypi'], + 'includes': ['../gypfiles/toolchain.gypi', '../gypfiles/features.gypi'], 'target_defaults': { 'type': 'executable', 'dependencies': [ - '../tools/gyp/v8.gyp:v8', - '../tools/gyp/v8.gyp:v8_libplatform', + '../src/v8.gyp:v8', + '../src/v8.gyp:v8_libplatform', ], 'include_dirs': [ '..', @@ -56,10 +57,15 @@ }, 'targets': [ { - 'target_name': 'shell', + 'target_name': 'v8_shell', 'sources': [ 'shell.cc', ], + 'conditions': [ + [ 'want_separate_host_toolset==1', { + 'toolsets': [ '<(v8_toolset_for_shell)', ], + }], + ], }, { 'target_name': 'hello-world', |