| OLD | NEW |
| 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 { | 5 { |
| 6 'variables': { | 6 'variables': { |
| 7 # .gyp files should set chromium_code to 1 if they build Chromium-specific | 7 # .gyp files should set chromium_code to 1 if they build Chromium-specific |
| 8 # code, as opposed to external code. This variable is used to control | 8 # code, as opposed to external code. This variable is used to control |
| 9 # such things as the set of warnings to enable, and whether warnings are | 9 # such things as the set of warnings to enable, and whether warnings are |
| 10 # treated as errors. | 10 # treated as errors. |
| (...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 347 ], | 347 ], |
| 348 }, | 348 }, |
| 349 }, | 349 }, |
| 350 'conditions': [ | 350 'conditions': [ |
| 351 ['OS=="linux"', { | 351 ['OS=="linux"', { |
| 352 'target_defaults': { | 352 'target_defaults': { |
| 353 # Enable -Werror by default, but put it in a variable so it can | 353 # Enable -Werror by default, but put it in a variable so it can |
| 354 # be disabled in ~/.gyp/include.gypi on the valgrind builders. | 354 # be disabled in ~/.gyp/include.gypi on the valgrind builders. |
| 355 'variables': { | 355 'variables': { |
| 356 'werror%': '-Werror', | 356 'werror%': '-Werror', |
| 357 'no_strict_aliasing%': 0, |
| 357 }, | 358 }, |
| 358 'cflags': [ | 359 'cflags': [ |
| 359 '<(werror)', # See note above about the werror variable. | 360 '<(werror)', # See note above about the werror variable. |
| 360 '-pthread', | 361 '-pthread', |
| 361 '-fno-exceptions', | 362 '-fno-exceptions', |
| 362 '-Wall', | 363 '-Wall', |
| 363 '-D_FILE_OFFSET_BITS=64', | 364 '-D_FILE_OFFSET_BITS=64', |
| 364 ], | 365 ], |
| 365 'cflags_cc': [ | 366 'cflags_cc': [ |
| 366 '-fno-rtti', | 367 '-fno-rtti', |
| (...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 532 ['chromeos==1', { | 533 ['chromeos==1', { |
| 533 'cflags': [ | 534 'cflags': [ |
| 534 '-march=armv7-a', | 535 '-march=armv7-a', |
| 535 '-mtune=cortex-a8', | 536 '-mtune=cortex-a8', |
| 536 '-mfpu=vfp', | 537 '-mfpu=vfp', |
| 537 '-mfloat-abi=softfp', | 538 '-mfloat-abi=softfp', |
| 538 ], | 539 ], |
| 539 }], | 540 }], |
| 540 ], | 541 ], |
| 541 }], | 542 }], |
| 543 ['no_strict_aliasing==1', { |
| 544 'cflags': [ |
| 545 '-fno-strict-aliasing', |
| 546 ], |
| 547 }], |
| 542 ], | 548 ], |
| 543 }, | 549 }, |
| 544 }], | 550 }], |
| 545 ['OS=="mac"', { | 551 ['OS=="mac"', { |
| 546 'target_defaults': { | 552 'target_defaults': { |
| 547 'variables': { | 553 'variables': { |
| 548 # This should be 'mac_real_dsym%', but there seems to be a bug | 554 # This should be 'mac_real_dsym%', but there seems to be a bug |
| 549 # with % in variables that are intended to be set to different | 555 # with % in variables that are intended to be set to different |
| 550 # values in different targets, like this one. | 556 # values in different targets, like this one. |
| 551 'mac_real_dsym': 0, # Fake .dSYMs are fine in most cases. | 557 'mac_real_dsym': 0, # Fake .dSYMs are fine in most cases. |
| (...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 761 # settings in target dicts. SYMROOT is a special case, because many other | 767 # settings in target dicts. SYMROOT is a special case, because many other |
| 762 # Xcode variables depend on it, including variables such as | 768 # Xcode variables depend on it, including variables such as |
| 763 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 769 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 764 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 770 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 765 # files to appear (when present) in the UI as actual files and not red | 771 # files to appear (when present) in the UI as actual files and not red |
| 766 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 772 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 767 # and therefore SYMROOT, needs to be set at the project level. | 773 # and therefore SYMROOT, needs to be set at the project level. |
| 768 'SYMROOT': '<(DEPTH)/xcodebuild', | 774 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 769 }, | 775 }, |
| 770 } | 776 } |
| OLD | NEW |