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

Side by Side Diff: build/common.gypi

Issue 39663002: Revert a temporary workaround for issue 310479, which led to TSan v2 slowdown on the bots. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 1 month 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
« 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 3267 matching lines...) Expand 10 before | Expand all | Expand 10 after
3278 ], 3278 ],
3279 }], 3279 }],
3280 ['_toolset=="target" and OS=="linux"', { 3280 ['_toolset=="target" and OS=="linux"', {
3281 'ldflags': [ 3281 'ldflags': [
3282 # http://crbug.com/234010. 3282 # http://crbug.com/234010.
3283 '-lrt', 3283 '-lrt',
3284 ], 3284 ],
3285 }], 3285 }],
3286 ], 3286 ],
3287 }], 3287 }],
3288 # TODO(glider): this is a temporary workaround for
3289 # http://crbug.com/310479.
3290 ['tsan==1', {
3291 'target_conditions': [
3292 ['_toolset=="target"', {
3293 'cflags!': [
3294 '-gline-tables-only',
3295 ],
3296 'cflags': [
3297 '-g',
3298 '-O1',
3299 '-fno-inline-functions',
3300 ' -fno-inline',
3301 ],
3302 }],
3303 ],
3304 }],
3305 ['asan==1', { 3288 ['asan==1', {
3306 'target_conditions': [ 3289 'target_conditions': [
3307 ['_toolset=="target"', { 3290 ['_toolset=="target"', {
3308 'cflags': [ 3291 'cflags': [
3309 '-fsanitize=address', 3292 '-fsanitize=address',
3310 '-w', # http://crbug.com/162783 3293 '-w', # http://crbug.com/162783
3311 ], 3294 ],
3312 'ldflags': [ 3295 'ldflags': [
3313 '-fsanitize=address', 3296 '-fsanitize=address',
3314 ], 3297 ],
(...skipping 1434 matching lines...) Expand 10 before | Expand all | Expand 10 after
4749 # settings in target dicts. SYMROOT is a special case, because many other 4732 # settings in target dicts. SYMROOT is a special case, because many other
4750 # Xcode variables depend on it, including variables such as 4733 # Xcode variables depend on it, including variables such as
4751 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4734 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4752 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4735 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4753 # files to appear (when present) in the UI as actual files and not red 4736 # files to appear (when present) in the UI as actual files and not red
4754 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4737 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4755 # and therefore SYMROOT, needs to be set at the project level. 4738 # and therefore SYMROOT, needs to be set at the project level.
4756 'SYMROOT': '<(DEPTH)/xcodebuild', 4739 'SYMROOT': '<(DEPTH)/xcodebuild',
4757 }, 4740 },
4758 } 4741 }
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