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

Side by Side Diff: build/common.gypi

Issue 239993009: Revert accidental dartium code push (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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 | « build/all.gyp ('k') | chrome/browser/resources/about_version.html » ('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 (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 402 matching lines...) Expand 10 before | Expand all | Expand 10 after
413 # libraries on linux x86-64 and arm, plus ASLR. 413 # libraries on linux x86-64 and arm, plus ASLR.
414 'linux_fpic%': 1, 414 'linux_fpic%': 1,
415 415
416 # Whether one-click signin is enabled or not. 416 # Whether one-click signin is enabled or not.
417 'enable_one_click_signin%': 0, 417 'enable_one_click_signin%': 0,
418 418
419 # Enable Chrome browser extensions 419 # Enable Chrome browser extensions
420 'enable_extensions%': 1, 420 'enable_extensions%': 1,
421 421
422 # Enable Google Now. 422 # Enable Google Now.
423 'enable_google_now%': 0, 423 'enable_google_now%': 1,
424 424
425 # Enable printing support and UI. This variable is used to configure 425 # Enable printing support and UI. This variable is used to configure
426 # which parts of printing will be built. 0 disables printing completely, 426 # which parts of printing will be built. 0 disables printing completely,
427 # 1 enables it fully, and 2 enables only the codepath to generate a 427 # 1 enables it fully, and 2 enables only the codepath to generate a
428 # Metafile (e.g. usually a PDF or EMF) and disables print preview, cloud 428 # Metafile (e.g. usually a PDF or EMF) and disables print preview, cloud
429 # print, UI, etc. 429 # print, UI, etc.
430 'enable_printing%': 1, 430 'enable_printing%': 1,
431 431
432 # Set the version of CLD. 432 # Set the version of CLD.
433 # 0: Don't specify the version. This option is for the Finch testing. 433 # 0: Don't specify the version. This option is for the Finch testing.
(...skipping 707 matching lines...) Expand 10 before | Expand all | Expand 10 after
1141 1141
1142 # Experimental setting to optimize Chrome's DLLs with PGO. 1142 # Experimental setting to optimize Chrome's DLLs with PGO.
1143 'chrome_pgo_phase%': '0', 1143 'chrome_pgo_phase%': '0',
1144 1144
1145 # The default settings for third party code for treating 1145 # The default settings for third party code for treating
1146 # warnings-as-errors. Ideally, this would not be required, however there 1146 # warnings-as-errors. Ideally, this would not be required, however there
1147 # is some third party code that takes a long time to fix/roll. So, this 1147 # is some third party code that takes a long time to fix/roll. So, this
1148 # flag allows us to have warnings as errors in general to prevent 1148 # flag allows us to have warnings as errors in general to prevent
1149 # regressions in most modules, while working on the bits that are 1149 # regressions in most modules, while working on the bits that are
1150 # remaining. 1150 # remaining.
1151 'win_third_party_warn_as_error%': 'false', 1151 'win_third_party_warn_as_error%': 'true',
1152 1152
1153 # Clang stuff. 1153 # Clang stuff.
1154 'clang%': '<(clang)', 1154 'clang%': '<(clang)',
1155 'make_clang_dir%': 'third_party/llvm-build/Release+Asserts', 1155 'make_clang_dir%': 'third_party/llvm-build/Release+Asserts',
1156 1156
1157 # Control which version of clang to use when building for iOS. If set to 1157 # Control which version of clang to use when building for iOS. If set to
1158 # '1', uses the version of clang that ships with Xcode. If set to '0', uses 1158 # '1', uses the version of clang that ships with Xcode. If set to '0', uses
1159 # the version of clang that ships with the Chromium source. This variable 1159 # the version of clang that ships with the Chromium source. This variable
1160 # is automatically set to '1' when using the Xcode generator. 1160 # is automatically set to '1' when using the Xcode generator.
1161 'clang_xcode%': 0, 1161 'clang_xcode%': 0,
(...skipping 1558 matching lines...) Expand 10 before | Expand all | Expand 10 after
2720 ], 2720 ],
2721 }], 2721 }],
2722 # TODO(darin): Unfortunately, some third_party code depends on base. 2722 # TODO(darin): Unfortunately, some third_party code depends on base.
2723 [ 'OS=="win" and component=="shared_library"', { 2723 [ 'OS=="win" and component=="shared_library"', {
2724 'msvs_disabled_warnings': [ 2724 'msvs_disabled_warnings': [
2725 4251, # class 'std::xx' needs to have dll-interface. 2725 4251, # class 'std::xx' needs to have dll-interface.
2726 ], 2726 ],
2727 }], 2727 }],
2728 [ 'OS=="mac" or OS=="ios"', { 2728 [ 'OS=="mac" or OS=="ios"', {
2729 'xcode_settings': { 2729 'xcode_settings': {
2730 'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO',
2731 'WARNING_CFLAGS!': ['-Wall', '-Wextra'], 2730 'WARNING_CFLAGS!': ['-Wall', '-Wextra'],
2732 }, 2731 },
2733 'conditions': [ 2732 'conditions': [
2734 ['buildtype=="Official"', { 2733 ['buildtype=="Official"', {
2735 'xcode_settings': { 2734 'xcode_settings': {
2736 'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO', # -Werror 2735 'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO', # -Werror
2737 }, 2736 },
2738 }], 2737 }],
2739 ], 2738 ],
2740 }], 2739 }],
(...skipping 2480 matching lines...) Expand 10 before | Expand all | Expand 10 after
5221 # settings in target dicts. SYMROOT is a special case, because many other 5220 # settings in target dicts. SYMROOT is a special case, because many other
5222 # Xcode variables depend on it, including variables such as 5221 # Xcode variables depend on it, including variables such as
5223 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5222 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5224 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5223 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5225 # files to appear (when present) in the UI as actual files and not red 5224 # files to appear (when present) in the UI as actual files and not red
5226 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5225 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5227 # and therefore SYMROOT, needs to be set at the project level. 5226 # and therefore SYMROOT, needs to be set at the project level.
5228 'SYMROOT': '<(DEPTH)/xcodebuild', 5227 'SYMROOT': '<(DEPTH)/xcodebuild',
5229 }, 5228 },
5230 } 5229 }
OLDNEW
« no previous file with comments | « build/all.gyp ('k') | chrome/browser/resources/about_version.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698