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

Side by Side Diff: build/common.gypi

Issue 194803006: Adds -Wno-deprecated-register to the build settings for iOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased. Created 6 years, 9 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 4421 matching lines...) Expand 10 before | Expand all | Expand 10 after
4432 'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'YES', 4432 'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'YES',
4433 'WARNING_CFLAGS': [ 4433 'WARNING_CFLAGS': [
4434 '-Wheader-hygiene', 4434 '-Wheader-hygiene',
4435 # Don't die on dtoa code that uses a char as an array index. 4435 # Don't die on dtoa code that uses a char as an array index.
4436 # This is required solely for base/third_party/dmg_fp/dtoa.cc. 4436 # This is required solely for base/third_party/dmg_fp/dtoa.cc.
4437 '-Wno-char-subscripts', 4437 '-Wno-char-subscripts',
4438 # See comment in the mac clang section above for this flag. 4438 # See comment in the mac clang section above for this flag.
4439 '-Wno-unneeded-internal-declaration', 4439 '-Wno-unneeded-internal-declaration',
4440 # Match OS X clang C++11 warning settings. 4440 # Match OS X clang C++11 warning settings.
4441 '-Wno-c++11-narrowing', 4441 '-Wno-c++11-narrowing',
4442 # As of Xcode 5.1, the register keyword is deprecated, but Chromium
4443 # code still uses it.
4444 '-Wno-deprecated-register',
4442 ], 4445 ],
4443 4446
4444 # Limit the valid architectures depending on "target_subarch".
4445 # This need to include the "arm" architectures but also the "x86"
4446 # ones (they are used when building for the simulator).
4447 'conditions': [ 4447 'conditions': [
4448 # Older Xcodes do not support -Wno-deprecated-register, so pass an
4449 # additional flag to suppress the "unknown compiler option" error.
4450 # Restrict this flag to builds that are either compiling with Xcode
4451 # or compiling with Xcode's Clang. This will allow Ninja builds to
4452 # continue failing on unknown compiler options.
4453 # TODO(rohitrao): This flag is temporary and should be removed as
4454 # soon as the iOS bots are updated to use Xcode 5.1.
4455 ['"<(GENERATOR)"=="xcode" or clang_xcode==1', {
4456 'WARNING_CFLAGS': [
4457 '-Wno-unknown-warning-option',
4458 ],
4459 }],
4460
4461 # Limit the valid architectures depending on "target_subarch".
4462 # This need to include the "arm" architectures but also the "x86"
4463 # ones (they are used when building for the simulator).
4448 ['target_subarch=="arm32"', { 4464 ['target_subarch=="arm32"', {
4449 'VALID_ARCHS': ['armv7', 'i386'], 4465 'VALID_ARCHS': ['armv7', 'i386'],
4450 }], 4466 }],
4451 ['target_subarch=="arm64"', { 4467 ['target_subarch=="arm64"', {
4452 'VALID_ARCHS': ['arm64', 'x86_64'], 4468 'VALID_ARCHS': ['arm64', 'x86_64'],
4453 }], 4469 }],
4454 ['target_subarch=="both"', { 4470 ['target_subarch=="both"', {
4455 'VALID_ARCHS': ['arm64', 'armv7', 'x86_64', 'i386'], 4471 'VALID_ARCHS': ['arm64', 'armv7', 'x86_64', 'i386'],
4456 }], 4472 }],
4457 ], 4473 ],
(...skipping 570 matching lines...) Expand 10 before | Expand all | Expand 10 after
5028 # settings in target dicts. SYMROOT is a special case, because many other 5044 # settings in target dicts. SYMROOT is a special case, because many other
5029 # Xcode variables depend on it, including variables such as 5045 # Xcode variables depend on it, including variables such as
5030 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5046 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5031 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5047 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5032 # files to appear (when present) in the UI as actual files and not red 5048 # files to appear (when present) in the UI as actual files and not red
5033 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5049 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5034 # and therefore SYMROOT, needs to be set at the project level. 5050 # and therefore SYMROOT, needs to be set at the project level.
5035 'SYMROOT': '<(DEPTH)/xcodebuild', 5051 'SYMROOT': '<(DEPTH)/xcodebuild',
5036 }, 5052 },
5037 } 5053 }
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