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

Side by Side Diff: build/common.gypi

Issue 1504913002: Revert of Enforce marking "override" for functions overriding Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 | « android_webview/renderer/aw_content_settings_client.h ('k') | build/config/clang/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 2209 matching lines...) Expand 10 before | Expand all | Expand 10 after
2220 }], 2220 }],
2221 ], 2221 ],
2222 }, 2222 },
2223 'clang_dynlib_flags%': '-Xclang -load -Xclang <(clang_lib_path) ', 2223 'clang_dynlib_flags%': '-Xclang -load -Xclang <(clang_lib_path) ',
2224 }, { # OS == "win" 2224 }, { # OS == "win"
2225 # On Windows, the plugin is built directly into clang, so there's 2225 # On Windows, the plugin is built directly into clang, so there's
2226 # no need to load it dynamically. 2226 # no need to load it dynamically.
2227 'clang_dynlib_flags%': '', 2227 'clang_dynlib_flags%': '',
2228 }], 2228 }],
2229 ], 2229 ],
2230 'clang_plugin_args%': '-Xclang -plugin-arg-find-bad-constructs -Xclang check-templates ' 2230 'clang_plugin_args%': '-Xclang -plugin-arg-find-bad-constructs -Xclang check-templates ',
2231 '-Xclang -plugin-arg-find-bad-constructs -Xclang enforce-overriding-bl ink ',
2232 }, 2231 },
2233 # If you change these, also change build/config/clang/BUILD.gn. 2232 # If you change these, also change build/config/clang/BUILD.gn.
2234 'clang_chrome_plugins_flags%': 2233 'clang_chrome_plugins_flags%':
2235 '<(clang_dynlib_flags)' 2234 '<(clang_dynlib_flags)'
2236 '-Xclang -add-plugin -Xclang find-bad-constructs <(clang_plugin_args)' , 2235 '-Xclang -add-plugin -Xclang find-bad-constructs <(clang_plugin_args)' ,
2237 }], 2236 }],
2238 ['asan==1 or msan==1 or lsan==1 or tsan==1', { 2237 ['asan==1 or msan==1 or lsan==1 or tsan==1', {
2239 'clang%': 1, 2238 'clang%': 1,
2240 'use_allocator%': 'none', 2239 'use_allocator%': 'none',
2241 'use_sanitizer_options%': 1, 2240 'use_sanitizer_options%': 1,
(...skipping 4126 matching lines...) Expand 10 before | Expand all | Expand 10 after
6368 # settings in target dicts. SYMROOT is a special case, because many other 6367 # settings in target dicts. SYMROOT is a special case, because many other
6369 # Xcode variables depend on it, including variables such as 6368 # Xcode variables depend on it, including variables such as
6370 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6369 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6371 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6370 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6372 # files to appear (when present) in the UI as actual files and not red 6371 # files to appear (when present) in the UI as actual files and not red
6373 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6372 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6374 # and therefore SYMROOT, needs to be set at the project level. 6373 # and therefore SYMROOT, needs to be set at the project level.
6375 'SYMROOT': '<(DEPTH)/xcodebuild', 6374 'SYMROOT': '<(DEPTH)/xcodebuild',
6376 }, 6375 },
6377 } 6376 }
OLDNEW
« no previous file with comments | « android_webview/renderer/aw_content_settings_client.h ('k') | build/config/clang/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698