diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2013-12-11 21:33:03 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2013-12-13 12:34:07 +0100 |
| commit | f2a33ff9cbc6d19943f1c7fbddd1f23d23975577 (patch) | |
| tree | 0586a32aa390ade8557dfd6b4897f43a07449578 /chromium/courgette | |
| parent | 5362912cdb5eea702b68ebe23702468d17c3017a (diff) | |
| download | qtwebengine-chromium-f2a33ff9cbc6d19943f1c7fbddd1f23d23975577.tar.gz | |
Update Chromium to branch 1650 (31.0.1650.63)
Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'chromium/courgette')
| -rw-r--r-- | chromium/courgette/courgette.gyp | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/chromium/courgette/courgette.gyp b/chromium/courgette/courgette.gyp index d6d4c154a2d..03ab825d0e1 100644 --- a/chromium/courgette/courgette.gyp +++ b/chromium/courgette/courgette.gyp @@ -102,7 +102,6 @@ 'encoded_program_unittest.cc', 'encode_decode_unittest.cc', 'ensemble_unittest.cc', - 'run_all_unittests.cc', 'streams_unittest.cc', 'typedrva_unittest.cc', 'versioning_unittest.cc', @@ -112,6 +111,7 @@ 'courgette_lib', '../base/base.gyp:base', '../base/base.gyp:base_i18n', + '../base/base.gyp:run_all_unittests', '../base/base.gyp:test_support_base', '../testing/gtest.gyp:gtest', ], @@ -203,5 +203,32 @@ }, ], }], + # The build infrastructure needs courgette to be named courgette64. + ['OS=="win" and target_arch=="x64"', { + 'targets': [ + { + 'target_name': 'courgette64', + 'type': 'none', + 'dependencies': [ + 'courgette', + ], + 'actions': [{ + 'action_name': 'courgette64', + 'inputs': [ + '<(PRODUCT_DIR)/courgette.exe', + ], + 'outputs': [ + '<(PRODUCT_DIR)/courgette64.exe', + ], + 'action': [ + 'python', + '../build/cp.py', + '<@(_inputs)', + '<@(_outputs)' + ], + }], + }, + ], + }], ], } |