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

Side by Side Diff: build/common.gypi

Issue 357623003: Move default sanitizer options into build/ so that WebRTC can import them. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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 3864 matching lines...) Expand 10 before | Expand all | Expand 10 after
3875 '-Wl,--as-needed', 3875 '-Wl,--as-needed',
3876 ], 3876 ],
3877 'defines': [ 3877 'defines': [
3878 'MEMORY_TOOL_REPLACES_ALLOCATOR', 3878 'MEMORY_TOOL_REPLACES_ALLOCATOR',
3879 ], 3879 ],
3880 }], 3880 }],
3881 ], 3881 ],
3882 # TODO(glider): enable the default options on other systems. 3882 # TODO(glider): enable the default options on other systems.
3883 'conditions': [ 3883 'conditions': [
3884 ['use_sanitizer_options==1 and OS=="linux" and (chromeos==0 or tar get_arch!="ia32")', { 3884 ['use_sanitizer_options==1 and OS=="linux" and (chromeos==0 or tar get_arch!="ia32")', {
3885 'dependencies': [ 3885 'dependencies': [
kjellander_chromium 2014/06/25 12:27:12 I think you should do something like: 'includes':
3886 '<(DEPTH)/base/base.gyp:sanitizer_options', 3886 '<(DEPTH)/build/sanitizers/sanitizers.gyp:sanitizer_options',
3887 ], 3887 ],
3888 }], 3888 }],
3889 ], 3889 ],
3890 }], 3890 }],
3891 ['asan==1', { 3891 ['asan==1', {
3892 'target_conditions': [ 3892 'target_conditions': [
3893 ['_toolset=="target"', { 3893 ['_toolset=="target"', {
3894 'cflags': [ 3894 'cflags': [
3895 '-fsanitize=address', 3895 '-fsanitize=address',
3896 '-w', # http://crbug.com/162783 3896 '-w', # http://crbug.com/162783
(...skipping 1614 matching lines...) Expand 10 before | Expand all | Expand 10 after
5511 # settings in target dicts. SYMROOT is a special case, because many other 5511 # settings in target dicts. SYMROOT is a special case, because many other
5512 # Xcode variables depend on it, including variables such as 5512 # Xcode variables depend on it, including variables such as
5513 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5513 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5514 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5514 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5515 # files to appear (when present) in the UI as actual files and not red 5515 # files to appear (when present) in the UI as actual files and not red
5516 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5516 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5517 # and therefore SYMROOT, needs to be set at the project level. 5517 # and therefore SYMROOT, needs to be set at the project level.
5518 'SYMROOT': '<(DEPTH)/xcodebuild', 5518 'SYMROOT': '<(DEPTH)/xcodebuild',
5519 }, 5519 },
5520 } 5520 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698