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

Side by Side Diff: build/common.gypi

Issue 231023002: Fix the condition to disable the warning when building with Xcode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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
« 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 4322 matching lines...) Expand 10 before | Expand all | Expand 10 after
4333 '-Xclang', '-add-plugin', '-Xclang', '<(clang_add_plugin)', 4333 '-Xclang', '-add-plugin', '-Xclang', '<(clang_add_plugin)',
4334 ], 4334 ],
4335 }], 4335 }],
4336 ['clang==1 and "<(GENERATOR)"=="ninja"', { 4336 ['clang==1 and "<(GENERATOR)"=="ninja"', {
4337 'OTHER_CFLAGS': [ 4337 'OTHER_CFLAGS': [
4338 # See http://crbug.com/110262 4338 # See http://crbug.com/110262
4339 '-fcolor-diagnostics', 4339 '-fcolor-diagnostics',
4340 ], 4340 ],
4341 }], 4341 }],
4342 ['OS=="ios" and target_subarch!="arm32" and \ 4342 ['OS=="ios" and target_subarch!="arm32" and \
4343 "<(GENERATOR)"=="ninja"', { 4343 "<(GENERATOR)"=="xcode"', {
4344 'OTHER_CFLAGS': [ 4344 'OTHER_CFLAGS': [
4345 # TODO(ios): when building Chrome for iOS on 64-bit platform 4345 # TODO(ios): when building Chrome for iOS on 64-bit platform
4346 # with Xcode, the -Wshorted-64-to-32 warning is automatically 4346 # with Xcode, the -Wshorted-64-to-32 warning is automatically
4347 # enabled. This cause failures when compiling protobuf code, 4347 # enabled. This cause failures when compiling protobuf code,
4348 # so disable the warning. http://crbug.com/359107 4348 # so disable the warning. http://crbug.com/359107
4349 '-Wno-shorten-64-to-32', 4349 '-Wno-shorten-64-to-32',
4350 ], 4350 ],
4351 }], 4351 }],
4352 ], 4352 ],
4353 }, 4353 },
(...skipping 855 matching lines...) Expand 10 before | Expand all | Expand 10 after
5209 # settings in target dicts. SYMROOT is a special case, because many other 5209 # settings in target dicts. SYMROOT is a special case, because many other
5210 # Xcode variables depend on it, including variables such as 5210 # Xcode variables depend on it, including variables such as
5211 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5211 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5212 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5212 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5213 # files to appear (when present) in the UI as actual files and not red 5213 # files to appear (when present) in the UI as actual files and not red
5214 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5214 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5215 # and therefore SYMROOT, needs to be set at the project level. 5215 # and therefore SYMROOT, needs to be set at the project level.
5216 'SYMROOT': '<(DEPTH)/xcodebuild', 5216 'SYMROOT': '<(DEPTH)/xcodebuild',
5217 }, 5217 },
5218 } 5218 }
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