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

Side by Side Diff: gyp/common_conditions.gypi

Issue 751713002: Revert of Add -ftrapv to debug builds. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 1 month 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 | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # conditions used in both common.gypi and skia.gyp in chromium 1 # conditions used in both common.gypi and skia.gyp in chromium
2 # 2 #
3 { 3 {
4 'defines': [ 4 'defines': [
5 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', 5 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)',
6 'SK_SUPPORT_GPU=<(skia_gpu)', 6 'SK_SUPPORT_GPU=<(skia_gpu)',
7 'SK_SUPPORT_OPENCL=<(skia_opencl)', 7 'SK_SUPPORT_OPENCL=<(skia_opencl)',
8 'SK_FORCE_DISTANCEFIELD_FONTS=<(skia_force_distancefield_fonts)', 8 'SK_FORCE_DISTANCEFIELD_FONTS=<(skia_force_distancefield_fonts)',
9 ], 9 ],
10 'conditions' : [ 10 'conditions' : [
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 'defines': [ 391 'defines': [
392 'SK_SAMPLES_FOR_X', 392 'SK_SAMPLES_FOR_X',
393 'SK_BUILD_FOR_UNIX', 393 'SK_BUILD_FOR_UNIX',
394 ], 394 ],
395 'configurations': { 395 'configurations': {
396 'Coverage': { 396 'Coverage': {
397 'cflags': ['--coverage'], 397 'cflags': ['--coverage'],
398 'ldflags': ['--coverage'], 398 'ldflags': ['--coverage'],
399 }, 399 },
400 'Debug': { 400 'Debug': {
401 'cflags': ['-ftrapv'], # Crash on signed integer over/underflow.
402 }, 401 },
403 'Release': { 402 'Release': {
404 'cflags': [ 403 'cflags': [
405 '-O<(skia_release_optimization_level)', 404 '-O<(skia_release_optimization_level)',
406 ], 405 ],
407 'defines': [ 'NDEBUG' ], 406 'defines': [ 'NDEBUG' ],
408 }, 407 },
409 }, 408 },
410 'conditions' : [ 409 'conditions' : [
411 [ 'skia_shared_lib', { 410 [ 'skia_shared_lib', {
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
572 # Android Text Tuning 571 # Android Text Tuning
573 'SK_GAMMA_EXPONENT=1.4', 572 'SK_GAMMA_EXPONENT=1.4',
574 'SK_GAMMA_CONTRAST=0.0', 573 'SK_GAMMA_CONTRAST=0.0',
575 ], 574 ],
576 # Android defines a fixed gamma exponent instead of using SRGB 575 # Android defines a fixed gamma exponent instead of using SRGB
577 'defines!': [ 576 'defines!': [
578 'SK_GAMMA_SRGB', 577 'SK_GAMMA_SRGB',
579 ], 578 ],
580 'configurations': { 579 'configurations': {
581 'Debug': { 580 'Debug': {
582 'cflags': ['-g', '-ftrapv'] 581 'cflags': ['-g']
583 }, 582 },
584 'Release': { 583 'Release': {
585 'cflags': ['-O2'], 584 'cflags': ['-O2'],
586 }, 585 },
587 }, 586 },
588 'libraries': [ 587 'libraries': [
589 '-llog', 588 '-llog',
590 ], 589 ],
591 'cflags': [ 590 'cflags': [
592 '-fuse-ld=gold', 591 '-fuse-ld=gold',
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
634 [ 'skia_is_bot', { 633 [ 'skia_is_bot', {
635 'defines': [ 'SK_CRASH_HANDLER' ], 634 'defines': [ 'SK_CRASH_HANDLER' ],
636 }], 635 }],
637 636
638 ], # end 'conditions' 637 ], # end 'conditions'
639 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details 638 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
640 'xcode_settings': { 639 'xcode_settings': {
641 'SYMROOT': '<(DEPTH)/xcodebuild', 640 'SYMROOT': '<(DEPTH)/xcodebuild',
642 }, 641 },
643 } 642 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698