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

Side by Side Diff: build/common.gypi

Issue 587433002: Roll Clang 216630:217949 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix the .gn file Created 6 years, 2 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 | build/config/compiler/BUILD.gn » ('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 2480 matching lines...) Expand 10 before | Expand all | Expand 10 after
2491 # This warns on using ints as initializers for floats in 2491 # This warns on using ints as initializers for floats in
2492 # initializer lists (e.g. |int a = f(); CGSize s = { a, a };|), 2492 # initializer lists (e.g. |int a = f(); CGSize s = { a, a };|),
2493 # which happens in several places in chrome code. Not sure if 2493 # which happens in several places in chrome code. Not sure if
2494 # this is worth fixing. 2494 # this is worth fixing.
2495 '-Wno-c++11-narrowing', 2495 '-Wno-c++11-narrowing',
2496 2496
2497 # Clang considers the `register` keyword as deprecated, but e.g. 2497 # Clang considers the `register` keyword as deprecated, but e.g.
2498 # code generated by flex (used in angle) contains that keyword. 2498 # code generated by flex (used in angle) contains that keyword.
2499 # http://crbug.com/255186 2499 # http://crbug.com/255186
2500 '-Wno-deprecated-register', 2500 '-Wno-deprecated-register',
2501
2502 # TODO(hans): Clean this up. Or disable with finer granularity.
2503 '-Wno-unused-local-typedef',
2501 ], 2504 ],
2502 }, 2505 },
2503 'includes': [ 'set_clang_warning_flags.gypi', ], 2506 'includes': [ 'set_clang_warning_flags.gypi', ],
2504 'defines': [ 2507 'defines': [
2505 # Don't use deprecated V8 APIs anywhere. 2508 # Don't use deprecated V8 APIs anywhere.
2506 'V8_DEPRECATION_WARNINGS', 2509 'V8_DEPRECATION_WARNINGS',
2507 ], 2510 ],
2508 'include_dirs': [ 2511 'include_dirs': [
2509 '<(SHARED_INTERMEDIATE_DIR)', 2512 '<(SHARED_INTERMEDIATE_DIR)',
2510 ], 2513 ],
(...skipping 3260 matching lines...) Expand 10 before | Expand all | Expand 10 after
5771 # settings in target dicts. SYMROOT is a special case, because many other 5774 # settings in target dicts. SYMROOT is a special case, because many other
5772 # Xcode variables depend on it, including variables such as 5775 # Xcode variables depend on it, including variables such as
5773 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5776 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5774 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5777 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5775 # files to appear (when present) in the UI as actual files and not red 5778 # files to appear (when present) in the UI as actual files and not red
5776 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5779 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5777 # and therefore SYMROOT, needs to be set at the project level. 5780 # and therefore SYMROOT, needs to be set at the project level.
5778 'SYMROOT': '<(DEPTH)/xcodebuild', 5781 'SYMROOT': '<(DEPTH)/xcodebuild',
5779 }, 5782 },
5780 } 5783 }
OLDNEW
« no previous file with comments | « no previous file | build/config/compiler/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698