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

Side by Side Diff: tools/gyp/v8.gyp

Issue 661171: Merge r3962 to trunk (Closed) Base URL: http://v8.googlecode.com/svn/trunk/
Patch Set: Created 10 years, 9 months 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 | Annotate | Revision Log
« no previous file with comments | « src/x64/virtual-frame-x64.cc ('k') | tools/visual_studio/v8_base.vcproj » ('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 2009 the V8 project authors. All rights reserved. 1 # Copyright 2009 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 373 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 '../../src/v8-counters.cc', 384 '../../src/v8-counters.cc',
385 '../../src/v8-counters.h', 385 '../../src/v8-counters.h',
386 '../../src/v8.cc', 386 '../../src/v8.cc',
387 '../../src/v8.h', 387 '../../src/v8.h',
388 '../../src/v8threads.cc', 388 '../../src/v8threads.cc',
389 '../../src/v8threads.h', 389 '../../src/v8threads.h',
390 '../../src/variables.cc', 390 '../../src/variables.cc',
391 '../../src/variables.h', 391 '../../src/variables.h',
392 '../../src/version.cc', 392 '../../src/version.cc',
393 '../../src/version.h', 393 '../../src/version.h',
394 '../../src/virtual-frame-inl.h',
394 '../../src/virtual-frame.h', 395 '../../src/virtual-frame.h',
395 '../../src/virtual-frame.cc', 396 '../../src/virtual-frame.cc',
396 '../../src/zone-inl.h', 397 '../../src/zone-inl.h',
397 '../../src/zone.cc', 398 '../../src/zone.cc',
398 '../../src/zone.h', 399 '../../src/zone.h',
399 ], 400 ],
400 'conditions': [ 401 'conditions': [
401 ['target_arch=="arm"', { 402 ['target_arch=="arm"', {
402 'include_dirs+': [ 403 'include_dirs+': [
403 '../../src/arm', 404 '../../src/arm',
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
623 ], 624 ],
624 'conditions': [ 625 'conditions': [
625 [ 'OS=="win"', { 626 [ 'OS=="win"', {
626 # This could be gotten by not setting chromium_code, if that's OK. 627 # This could be gotten by not setting chromium_code, if that's OK.
627 'defines': ['_CRT_SECURE_NO_WARNINGS'], 628 'defines': ['_CRT_SECURE_NO_WARNINGS'],
628 }], 629 }],
629 ], 630 ],
630 }, 631 },
631 ], 632 ],
632 } 633 }
OLDNEW
« no previous file with comments | « src/x64/virtual-frame-x64.cc ('k') | tools/visual_studio/v8_base.vcproj » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698