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

Side by Side Diff: build/common.gypi

Issue 12716011: Hotfix the build on the ChromeOS ASan bots: only add a dependency on ASan dynamic runtime for OS X … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 9 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
« 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 1639 matching lines...) Expand 10 before | Expand all | Expand 10 after
1650 # See http://gcc.gnu.org/onlinedocs/gcc-4.4.2/gcc/Optimize-Options.htm l 1650 # See http://gcc.gnu.org/onlinedocs/gcc-4.4.2/gcc/Optimize-Options.htm l
1651 'mac_release_optimization%': '3', # Use -O3 unless overridden 1651 'mac_release_optimization%': '3', # Use -O3 unless overridden
1652 'mac_debug_optimization%': '0', # Use -O0 unless overridden 1652 'mac_debug_optimization%': '0', # Use -O0 unless overridden
1653 }], 1653 }],
1654 ], 1654 ],
1655 }, 1655 },
1656 # TODO(teravest): Remove this define once uses of USE_SKIA are cleaned up 1656 # TODO(teravest): Remove this define once uses of USE_SKIA are cleaned up
1657 # throughout the codebase. 1657 # throughout the codebase.
1658 'defines' : ['USE_SKIA'], 1658 'defines' : ['USE_SKIA'],
1659 'conditions': [ 1659 'conditions': [
1660 ['asan==1', { 1660 ['(OS=="mac" or OS=="ios") and asan==1', {
1661 'dependencies': [ 1661 'dependencies': [
1662 '<(DEPTH)/build/mac/asan.gyp:asan_dynamic_runtime', 1662 '<(DEPTH)/build/mac/asan.gyp:asan_dynamic_runtime',
1663 ], 1663 ],
1664 }], 1664 }],
1665 ['OS=="linux" and linux_use_tcmalloc==1 and clang_type_profiler==1', { 1665 ['OS=="linux" and linux_use_tcmalloc==1 and clang_type_profiler==1', {
1666 'cflags_cc!': ['-fno-rtti'], 1666 'cflags_cc!': ['-fno-rtti'],
1667 'cflags_cc+': [ 1667 'cflags_cc+': [
1668 '-frtti', 1668 '-frtti',
1669 '-gline-tables-only', 1669 '-gline-tables-only',
1670 '-fintercept-allocation-functions', 1670 '-fintercept-allocation-functions',
(...skipping 2470 matching lines...) Expand 10 before | Expand all | Expand 10 after
4141 # settings in target dicts. SYMROOT is a special case, because many other 4141 # settings in target dicts. SYMROOT is a special case, because many other
4142 # Xcode variables depend on it, including variables such as 4142 # Xcode variables depend on it, including variables such as
4143 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4143 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4144 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4144 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4145 # files to appear (when present) in the UI as actual files and not red 4145 # files to appear (when present) in the UI as actual files and not red
4146 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4146 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4147 # and therefore SYMROOT, needs to be set at the project level. 4147 # and therefore SYMROOT, needs to be set at the project level.
4148 'SYMROOT': '<(DEPTH)/xcodebuild', 4148 'SYMROOT': '<(DEPTH)/xcodebuild',
4149 }, 4149 },
4150 } 4150 }
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