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

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: Comment. 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 4176 matching lines...) Expand 10 before | Expand all | Expand 10 after
4187 'OTHER_CFLAGS': [ 4187 'OTHER_CFLAGS': [
4188 '-Xclang', '-add-plugin', '-Xclang', '<(clang_add_plugin)', 4188 '-Xclang', '-add-plugin', '-Xclang', '<(clang_add_plugin)',
4189 ], 4189 ],
4190 }], 4190 }],
4191 ['clang==1 and "<(GENERATOR)"=="ninja"', { 4191 ['clang==1 and "<(GENERATOR)"=="ninja"', {
4192 'OTHER_CFLAGS': [ 4192 'OTHER_CFLAGS': [
4193 # See http://crbug.com/110262 4193 # See http://crbug.com/110262
4194 '-fcolor-diagnostics', 4194 '-fcolor-diagnostics',
4195 ], 4195 ],
4196 }], 4196 }],
4197 # TODO(rohitrao): This flag is temporary and should be removed as
4198 # soon as the iOS bots are updated to use Xcode 5.1.
4199 ['OS=="ios" and ("<(GENERATOR)"=="xcode" or clang_xcode==1)', {
rohitrao (ping after 24h) 2014/03/11 20:43:24 This conditions clause works if I put it here, but
4200 'WARNING_CFLAGS': [
4201 '-Wno-unknown-warning-option',
4202 ],
4203 }],
4197 ], 4204 ],
4198 }, 4205 },
4199 'conditions': [ 4206 'conditions': [
4200 ['clang==1', { 4207 ['clang==1', {
4201 'variables': { 4208 'variables': {
4202 'clang_dir': '../third_party/llvm-build/Release+Asserts/bin', 4209 'clang_dir': '../third_party/llvm-build/Release+Asserts/bin',
4203 }, 4210 },
4204 }], 4211 }],
4205 ['asan==1', { 4212 ['asan==1', {
4206 'xcode_settings': { 4213 'xcode_settings': {
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
4456 'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'YES', 4463 'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'YES',
4457 'WARNING_CFLAGS': [ 4464 'WARNING_CFLAGS': [
4458 '-Wheader-hygiene', 4465 '-Wheader-hygiene',
4459 # Don't die on dtoa code that uses a char as an array index. 4466 # Don't die on dtoa code that uses a char as an array index.
4460 # This is required solely for base/third_party/dmg_fp/dtoa.cc. 4467 # This is required solely for base/third_party/dmg_fp/dtoa.cc.
4461 '-Wno-char-subscripts', 4468 '-Wno-char-subscripts',
4462 # See comment in the mac clang section above for this flag. 4469 # See comment in the mac clang section above for this flag.
4463 '-Wno-unneeded-internal-declaration', 4470 '-Wno-unneeded-internal-declaration',
4464 # Match OS X clang C++11 warning settings. 4471 # Match OS X clang C++11 warning settings.
4465 '-Wno-c++11-narrowing', 4472 '-Wno-c++11-narrowing',
4473 # As of Xcode 5.1, the register keyword is deprecated, but Chromium
4474 # code still uses it.
4475 '-Wno-deprecated-register',
4466 ], 4476 ],
4467 4477
rohitrao (ping after 24h) 2014/03/11 20:43:24 If I put the following code here, the flag gets ig
Mark Mentovai 2014/03/11 20:46:38 rohitrao wrote:
4468 # Limit the valid architectures depending on "target_subarch". 4478 # Limit the valid architectures depending on "target_subarch".
4469 # This need to include the "arm" architectures but also the "x86" 4479 # This need to include the "arm" architectures but also the "x86"
4470 # ones (they are used when building for the simulator). 4480 # ones (they are used when building for the simulator).
4471 'conditions': [ 4481 'conditions': [
4472 ['target_subarch=="arm32"', { 4482 ['target_subarch=="arm32"', {
4473 'VALID_ARCHS': ['armv7', 'i386'], 4483 'VALID_ARCHS': ['armv7', 'i386'],
4474 }], 4484 }],
4475 ['target_subarch=="arm64"', { 4485 ['target_subarch=="arm64"', {
4476 'VALID_ARCHS': ['arm64', 'x86_64'], 4486 'VALID_ARCHS': ['arm64', 'x86_64'],
4477 }], 4487 }],
(...skipping 574 matching lines...) Expand 10 before | Expand all | Expand 10 after
5052 # settings in target dicts. SYMROOT is a special case, because many other 5062 # settings in target dicts. SYMROOT is a special case, because many other
5053 # Xcode variables depend on it, including variables such as 5063 # Xcode variables depend on it, including variables such as
5054 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5064 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5055 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5065 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5056 # files to appear (when present) in the UI as actual files and not red 5066 # files to appear (when present) in the UI as actual files and not red
5057 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5067 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5058 # and therefore SYMROOT, needs to be set at the project level. 5068 # and therefore SYMROOT, needs to be set at the project level.
5059 'SYMROOT': '<(DEPTH)/xcodebuild', 5069 'SYMROOT': '<(DEPTH)/xcodebuild',
5060 }, 5070 },
5061 } 5071 }
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