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

Side by Side Diff: trunk/src/build/common.gypi

Issue 16840002: Revert 205709 "Try turning on the partition allocator temporaril..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 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
« 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 1794 matching lines...) Expand 10 before | Expand all | Expand 10 after
1805 'mac_release_optimization%': 's', # Use -Os unless overridden 1805 'mac_release_optimization%': 's', # Use -Os unless overridden
1806 'mac_debug_optimization%': '0', # Use -O0 unless overridden 1806 'mac_debug_optimization%': '0', # Use -O0 unless overridden
1807 }, { 1807 }, {
1808 # See http://gcc.gnu.org/onlinedocs/gcc-4.4.2/gcc/Optimize-Options.htm l 1808 # See http://gcc.gnu.org/onlinedocs/gcc-4.4.2/gcc/Optimize-Options.htm l
1809 'mac_release_optimization%': '3', # Use -O3 unless overridden 1809 'mac_release_optimization%': '3', # Use -O3 unless overridden
1810 'mac_debug_optimization%': '0', # Use -O0 unless overridden 1810 'mac_debug_optimization%': '0', # Use -O0 unless overridden
1811 }], 1811 }],
1812 ], 1812 ],
1813 }, 1813 },
1814 'conditions': [ 1814 'conditions': [
1815 ['os_posix==1', {
1816 'defines': ['ENABLE_PARTITION_ALLOC=1'],
1817 }],
1818 ['(OS=="mac" or OS=="ios") and asan==1', { 1815 ['(OS=="mac" or OS=="ios") and asan==1', {
1819 'dependencies': [ 1816 'dependencies': [
1820 '<(DEPTH)/build/mac/asan.gyp:asan_dynamic_runtime', 1817 '<(DEPTH)/build/mac/asan.gyp:asan_dynamic_runtime',
1821 ], 1818 ],
1822 }], 1819 }],
1823 ['OS=="linux" and linux_use_tcmalloc==1 and clang_type_profiler==1', { 1820 ['OS=="linux" and linux_use_tcmalloc==1 and clang_type_profiler==1', {
1824 'cflags_cc!': ['-fno-rtti'], 1821 'cflags_cc!': ['-fno-rtti'],
1825 'cflags_cc+': [ 1822 'cflags_cc+': [
1826 '-frtti', 1823 '-frtti',
1827 '-gline-tables-only', 1824 '-gline-tables-only',
(...skipping 2697 matching lines...) Expand 10 before | Expand all | Expand 10 after
4525 # settings in target dicts. SYMROOT is a special case, because many other 4522 # settings in target dicts. SYMROOT is a special case, because many other
4526 # Xcode variables depend on it, including variables such as 4523 # Xcode variables depend on it, including variables such as
4527 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4524 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4528 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4525 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4529 # files to appear (when present) in the UI as actual files and not red 4526 # files to appear (when present) in the UI as actual files and not red
4530 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4527 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4531 # and therefore SYMROOT, needs to be set at the project level. 4528 # and therefore SYMROOT, needs to be set at the project level.
4532 'SYMROOT': '<(DEPTH)/xcodebuild', 4529 'SYMROOT': '<(DEPTH)/xcodebuild',
4533 }, 4530 },
4534 } 4531 }
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