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

Side by Side Diff: build/common.gypi

Issue 11417011: Move werror variable declation to non-conditional block. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | Annotate | Revision Log
« 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 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 656 matching lines...) Expand 10 before | Expand all | Expand 10 after
667 'wix_path%': '<(wix_path)', 667 'wix_path%': '<(wix_path)',
668 'android_upstream_bringup%': '<(android_upstream_bringup)', 668 'android_upstream_bringup%': '<(android_upstream_bringup)',
669 'use_libjpeg_turbo%': '<(use_libjpeg_turbo)', 669 'use_libjpeg_turbo%': '<(use_libjpeg_turbo)',
670 'use_system_libjpeg%': '<(use_system_libjpeg)', 670 'use_system_libjpeg%': '<(use_system_libjpeg)',
671 'android_build_type%': '<(android_build_type)', 671 'android_build_type%': '<(android_build_type)',
672 'use_official_google_api_keys%': '<(use_official_google_api_keys)', 672 'use_official_google_api_keys%': '<(use_official_google_api_keys)',
673 'google_api_key%': '<(google_api_key)', 673 'google_api_key%': '<(google_api_key)',
674 'google_default_client_id%': '<(google_default_client_id)', 674 'google_default_client_id%': '<(google_default_client_id)',
675 'google_default_client_secret%': '<(google_default_client_secret)', 675 'google_default_client_secret%': '<(google_default_client_secret)',
676 676
677 # Enable -Werror by default, but put it in a variable so it can
678 # be disabled (e.g. in ~/.gyp/include.gypi on the valgrind builders).
679 # This is needed on all platforms since it is used when building
680 # NaCl untrusted code.
681 'werror%': '-Werror',
682
677 # Use system protobuf instead of bundled one. 683 # Use system protobuf instead of bundled one.
678 'use_system_protobuf%': 0, 684 'use_system_protobuf%': 0,
679 685
680 # Use system yasm instead of bundled one. 686 # Use system yasm instead of bundled one.
681 'use_system_yasm%': 0, 687 'use_system_yasm%': 0,
682 688
683 # Default to enabled PIE; this is important for ASLR but we may need to be 689 # Default to enabled PIE; this is important for ASLR but we may need to be
684 # able to turn it off for various reasons. 690 # able to turn it off for various reasons.
685 'linux_disable_pie%': 0, 691 'linux_disable_pie%': 0,
686 692
(...skipping 1514 matching lines...) Expand 10 before | Expand all | Expand 10 after
2201 'Release_x64': { 2207 'Release_x64': {
2202 'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base'], 2208 'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base'],
2203 }, 2209 },
2204 }], 2210 }],
2205 ], 2211 ],
2206 }, 2212 },
2207 }, 2213 },
2208 'conditions': [ 2214 'conditions': [
2209 ['os_posix==1 and OS!="mac" and OS!="ios"', { 2215 ['os_posix==1 and OS!="mac" and OS!="ios"', {
2210 'target_defaults': { 2216 'target_defaults': {
2211 # Enable -Werror by default, but put it in a variable so it can
2212 # be disabled in ~/.gyp/include.gypi on the valgrind builders.
2213 'variables': { 2217 'variables': {
2214 'werror%': '-Werror',
2215 'libraries_for_target%': '', 2218 'libraries_for_target%': '',
2216 }, 2219 },
2217 'defines': [ 2220 'defines': [
2218 '_FILE_OFFSET_BITS=64', 2221 '_FILE_OFFSET_BITS=64',
2219 ], 2222 ],
2220 'cflags': [ 2223 'cflags': [
2221 '<(werror)', # See note above about the werror variable. 2224 '<(werror)', # See note above about the werror variable.
2222 '-pthread', 2225 '-pthread',
2223 '-fno-exceptions', 2226 '-fno-exceptions',
2224 '-fno-strict-aliasing', # See http://crbug.com/32204 2227 '-fno-strict-aliasing', # See http://crbug.com/32204
(...skipping 1523 matching lines...) Expand 10 before | Expand all | Expand 10 after
3748 # settings in target dicts. SYMROOT is a special case, because many other 3751 # settings in target dicts. SYMROOT is a special case, because many other
3749 # Xcode variables depend on it, including variables such as 3752 # Xcode variables depend on it, including variables such as
3750 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3753 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3751 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3754 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3752 # files to appear (when present) in the UI as actual files and not red 3755 # files to appear (when present) in the UI as actual files and not red
3753 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3756 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3754 # and therefore SYMROOT, needs to be set at the project level. 3757 # and therefore SYMROOT, needs to be set at the project level.
3755 'SYMROOT': '<(DEPTH)/xcodebuild', 3758 'SYMROOT': '<(DEPTH)/xcodebuild',
3756 }, 3759 },
3757 } 3760 }
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