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

Side by Side Diff: build/common.gypi

Issue 683113005: Update from chromium https://crrev.com/302282 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 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
« no previous file with comments | « build/android/pylib/utils/watchdog_timer.py ('k') | build/config/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 4139 matching lines...) Expand 10 before | Expand all | Expand 10 after
4150 'MEMORY_SANITIZER_INITIAL_SIZE', 4150 'MEMORY_SANITIZER_INITIAL_SIZE',
4151 ], 4151 ],
4152 }], 4152 }],
4153 ], 4153 ],
4154 }], 4154 }],
4155 ['asan==1', { 4155 ['asan==1', {
4156 'target_conditions': [ 4156 'target_conditions': [
4157 ['_toolset=="target"', { 4157 ['_toolset=="target"', {
4158 'cflags': [ 4158 'cflags': [
4159 '-fsanitize=address', 4159 '-fsanitize=address',
4160 '-fsanitize-blacklist=<(asan_blacklist)', 4160 # TODO(earthdok): Re-enable. http://crbug.com/427202
4161 #'-fsanitize-blacklist=<(asan_blacklist)',
4161 ], 4162 ],
4162 'ldflags': [ 4163 'ldflags': [
4163 '-fsanitize=address', 4164 '-fsanitize=address',
4164 ], 4165 ],
4165 }], 4166 }],
4166 ], 4167 ],
4167 'conditions': [ 4168 'conditions': [
4168 ['OS=="mac"', { 4169 ['OS=="mac"', {
4169 'cflags': [ 4170 'cflags': [
4170 '-mllvm -asan-globals=0', # http://crbug.com/352073 4171 '-mllvm -asan-globals=0', # http://crbug.com/352073
(...skipping 1707 matching lines...) Expand 10 before | Expand all | Expand 10 after
5878 # settings in target dicts. SYMROOT is a special case, because many other 5879 # settings in target dicts. SYMROOT is a special case, because many other
5879 # Xcode variables depend on it, including variables such as 5880 # Xcode variables depend on it, including variables such as
5880 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5881 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5881 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5882 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5882 # files to appear (when present) in the UI as actual files and not red 5883 # files to appear (when present) in the UI as actual files and not red
5883 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5884 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5884 # and therefore SYMROOT, needs to be set at the project level. 5885 # and therefore SYMROOT, needs to be set at the project level.
5885 'SYMROOT': '<(DEPTH)/xcodebuild', 5886 'SYMROOT': '<(DEPTH)/xcodebuild',
5886 }, 5887 },
5887 } 5888 }
OLDNEW
« no previous file with comments | « build/android/pylib/utils/watchdog_timer.py ('k') | build/config/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698