Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(187)

Side by Side Diff: test/cctest/cctest.gyp

Issue 794213002: Fix builds w/ component=="shared_library" and v8_use_external_startup_data==1. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | test/unittests/unittests.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2012 the V8 project authors. All rights reserved. 1 # Copyright 2012 the V8 project authors. All rights reserved.
2 # Redistribution and use in source and binary forms, with or without 2 # Redistribution and use in source and binary forms, with or without
3 # modification, are permitted provided that the following conditions are 3 # modification, are permitted provided that the following conditions are
4 # met: 4 # met:
5 # 5 #
6 # * Redistributions of source code must retain the above copyright 6 # * Redistributions of source code must retain the above copyright
7 # notice, this list of conditions and the following disclaimer. 7 # notice, this list of conditions and the following disclaimer.
8 # * Redistributions in binary form must reproduce the above 8 # * Redistributions in binary form must reproduce the above
9 # copyright notice, this list of conditions and the following 9 # copyright notice, this list of conditions and the following
10 # disclaimer in the documentation and/or other materials provided 10 # disclaimer in the documentation and/or other materials provided
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 'VCCLCompilerTool': { 252 'VCCLCompilerTool': {
253 # MSVS wants this for gay-{precision,shortest}.cc. 253 # MSVS wants this for gay-{precision,shortest}.cc.
254 'AdditionalOptions': ['/bigobj'], 254 'AdditionalOptions': ['/bigobj'],
255 }, 255 },
256 }, 256 },
257 }], 257 }],
258 ['component=="shared_library"', { 258 ['component=="shared_library"', {
259 # cctest can't be built against a shared library, so we need to 259 # cctest can't be built against a shared library, so we need to
260 # depend on the underlying static target in that case. 260 # depend on the underlying static target in that case.
261 'conditions': [ 261 'conditions': [
262 ['v8_use_snapshot=="true"', { 262 ['v8_use_snapshot=="true" and v8_use_external_startup_data==0', {
263 'dependencies': ['../../tools/gyp/v8.gyp:v8_snapshot'], 263 'dependencies': ['../../tools/gyp/v8.gyp:v8_snapshot'],
264 }, 264 }],
265 { 265 ['v8_use_snapshot=="true" and v8_use_external_startup_data==1', {
266 'dependencies': [ 266 'dependencies': ['../../tools/gyp/v8.gyp:v8_external_snapshot'],
267 '../../tools/gyp/v8.gyp:v8_nosnapshot', 267 }],
268 ], 268 ['v8_use_snapshot!="true"', {
269 'dependencies': ['../../tools/gyp/v8.gyp:v8_nosnapshot'],
269 }], 270 }],
270 ], 271 ],
271 }, { 272 }, {
272 'dependencies': ['../../tools/gyp/v8.gyp:v8'], 273 'dependencies': ['../../tools/gyp/v8.gyp:v8'],
273 }], 274 }],
274 ], 275 ],
275 }, 276 },
276 { 277 {
277 'target_name': 'resources', 278 'target_name': 'resources',
278 'type': 'none', 279 'type': 'none',
(...skipping 24 matching lines...) Expand all
303 '../../tools/js2c.py', 304 '../../tools/js2c.py',
304 '<@(_outputs)', 305 '<@(_outputs)',
305 'TEST', # type 306 'TEST', # type
306 '<@(file_list)', 307 '<@(file_list)',
307 ], 308 ],
308 } 309 }
309 ], 310 ],
310 }, 311 },
311 ], 312 ],
312 } 313 }
OLDNEW
« no previous file with comments | « no previous file | test/unittests/unittests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698