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

Side by Side Diff: build/common.gypi

Issue 453513004: Roll Clang 214024:216630 (+216684) and switch to CMake (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase, fix blink-gc plugin flags, disable -Wundefined-bool-conversion while testing Created 6 years, 4 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 | Annotate | Revision Log
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 2451 matching lines...) Expand 10 before | Expand all | Expand 10 after
2462 # This warns on using ints as initializers for floats in 2462 # This warns on using ints as initializers for floats in
2463 # initializer lists (e.g. |int a = f(); CGSize s = { a, a };|), 2463 # initializer lists (e.g. |int a = f(); CGSize s = { a, a };|),
2464 # which happens in several places in chrome code. Not sure if 2464 # which happens in several places in chrome code. Not sure if
2465 # this is worth fixing. 2465 # this is worth fixing.
2466 '-Wno-c++11-narrowing', 2466 '-Wno-c++11-narrowing',
2467 2467
2468 # Clang considers the `register` keyword as deprecated, but e.g. 2468 # Clang considers the `register` keyword as deprecated, but e.g.
2469 # code generated by flex (used in angle) contains that keyword. 2469 # code generated by flex (used in angle) contains that keyword.
2470 # http://crbug.com/255186 2470 # http://crbug.com/255186
2471 '-Wno-deprecated-register', 2471 '-Wno-deprecated-register',
2472
2473 # XXX: Just while testing that the clang binaries execute.
2474 '-Wno-undefined-bool-conversion',
2472 ], 2475 ],
2473 }, 2476 },
2474 'includes': [ 'set_clang_warning_flags.gypi', ], 2477 'includes': [ 'set_clang_warning_flags.gypi', ],
2475 'defines': [ 2478 'defines': [
2476 # Don't use deprecated V8 APIs anywhere. 2479 # Don't use deprecated V8 APIs anywhere.
2477 'V8_DEPRECATION_WARNINGS', 2480 'V8_DEPRECATION_WARNINGS',
2478 ], 2481 ],
2479 'include_dirs': [ 2482 'include_dirs': [
2480 '<(SHARED_INTERMEDIATE_DIR)', 2483 '<(SHARED_INTERMEDIATE_DIR)',
2481 ], 2484 ],
(...skipping 3176 matching lines...) Expand 10 before | Expand all | Expand 10 after
5658 # settings in target dicts. SYMROOT is a special case, because many other 5661 # settings in target dicts. SYMROOT is a special case, because many other
5659 # Xcode variables depend on it, including variables such as 5662 # Xcode variables depend on it, including variables such as
5660 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5663 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5661 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5664 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5662 # files to appear (when present) in the UI as actual files and not red 5665 # files to appear (when present) in the UI as actual files and not red
5663 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5666 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5664 # and therefore SYMROOT, needs to be set at the project level. 5667 # and therefore SYMROOT, needs to be set at the project level.
5665 'SYMROOT': '<(DEPTH)/xcodebuild', 5668 'SYMROOT': '<(DEPTH)/xcodebuild',
5666 }, 5669 },
5667 } 5670 }
OLDNEW
« no previous file with comments | « no previous file | tools/clang/blink_gc_plugin/BlinkGCPlugin.cpp » ('j') | tools/clang/scripts/update.sh » ('J')

Powered by Google App Engine
This is Rietveld 408576698