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

Side by Side Diff: build/common.gypi

Issue 492773002: Removed the redundant 'OS=win' condition (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed entry from AUTHORs list Created 6 years, 3 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
« 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 2986 matching lines...) Expand 10 before | Expand all | Expand 10 after
2997 ['buildtype=="Official"', { 2997 ['buildtype=="Official"', {
2998 'msvs_settings': { 2998 'msvs_settings': {
2999 'VCCLCompilerTool': { 'WarnAsError': 'false' }, 2999 'VCCLCompilerTool': { 'WarnAsError': 'false' },
3000 } 3000 }
3001 }], 3001 }],
3002 ['clang==1', { 3002 ['clang==1', {
3003 'msvs_settings': { 3003 'msvs_settings': {
3004 'VCCLCompilerTool': { 'WarnAsError': 'false' }, 3004 'VCCLCompilerTool': { 'WarnAsError': 'false' },
3005 } 3005 }
3006 }], 3006 }],
3007 [ 'component=="shared_library"', {
3008 # TODO(darin): Unfortunately, some third_party code depends on bas e.
3009 'msvs_disabled_warnings': [
3010 4251, # class 'std::xx' needs to have dll-interface.
3011 ],
3012 }],
3007 ], 3013 ],
3008 }], 3014 }],
3009 # TODO(darin): Unfortunately, some third_party code depends on base. 3015
3010 [ 'OS=="win" and component=="shared_library"', {
3011 'msvs_disabled_warnings': [
3012 4251, # class 'std::xx' needs to have dll-interface.
3013 ],
3014 }],
3015 [ 'OS=="mac" or OS=="ios"', { 3016 [ 'OS=="mac" or OS=="ios"', {
3016 'xcode_settings': { 3017 'xcode_settings': {
3017 'WARNING_CFLAGS!': ['-Wall', '-Wextra'], 3018 'WARNING_CFLAGS!': ['-Wall', '-Wextra'],
3018 }, 3019 },
3019 'conditions': [ 3020 'conditions': [
3020 ['buildtype=="Official"', { 3021 ['buildtype=="Official"', {
3021 'xcode_settings': { 3022 'xcode_settings': {
3022 'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO', # -Werror 3023 'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO', # -Werror
3023 }, 3024 },
3024 }], 3025 }],
(...skipping 2679 matching lines...) Expand 10 before | Expand all | Expand 10 after
5704 # settings in target dicts. SYMROOT is a special case, because many other 5705 # settings in target dicts. SYMROOT is a special case, because many other
5705 # Xcode variables depend on it, including variables such as 5706 # Xcode variables depend on it, including variables such as
5706 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5707 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5707 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5708 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5708 # files to appear (when present) in the UI as actual files and not red 5709 # files to appear (when present) in the UI as actual files and not red
5709 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5710 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5710 # and therefore SYMROOT, needs to be set at the project level. 5711 # and therefore SYMROOT, needs to be set at the project level.
5711 'SYMROOT': '<(DEPTH)/xcodebuild', 5712 'SYMROOT': '<(DEPTH)/xcodebuild',
5712 }, 5713 },
5713 } 5714 }
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