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

Side by Side Diff: build/common.gypi

Issue 16951012: Add the missing commas before MEMORY_TOOL_REPLACES_ALLOCATOR. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
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 2060 matching lines...) Expand 10 before | Expand all | Expand 10 after
2071 }], 2071 }],
2072 ['asan==1 and OS=="win"', { 2072 ['asan==1 and OS=="win"', {
2073 # Since asan on windows uses Syzygy, we need /PROFILE turned on to 2073 # Since asan on windows uses Syzygy, we need /PROFILE turned on to
2074 # produce appropriate pdbs. 2074 # produce appropriate pdbs.
2075 'msvs_settings': { 2075 'msvs_settings': {
2076 'VCLinkerTool': { 2076 'VCLinkerTool': {
2077 'Profile': 'true', 2077 'Profile': 'true',
2078 }, 2078 },
2079 }, 2079 },
2080 'defines': [ 2080 'defines': [
2081 'ADDRESS_SANITIZER' 2081 'ADDRESS_SANITIZER',
2082 'MEMORY_TOOL_REPLACES_ALLOCATOR', 2082 'MEMORY_TOOL_REPLACES_ALLOCATOR',
2083 ], 2083 ],
2084 }], # asan==1 and OS=="win" 2084 }], # asan==1 and OS=="win"
2085 ['coverage!=0', { 2085 ['coverage!=0', {
2086 'conditions': [ 2086 'conditions': [
2087 ['OS=="mac" or OS=="ios"', { 2087 ['OS=="mac" or OS=="ios"', {
2088 'xcode_settings': { 2088 'xcode_settings': {
2089 'GCC_INSTRUMENT_PROGRAM_FLOW_ARCS': 'YES', # -fprofile-arcs 2089 'GCC_INSTRUMENT_PROGRAM_FLOW_ARCS': 'YES', # -fprofile-arcs
2090 'GCC_GENERATE_TEST_COVERAGE_FILES': 'YES', # -ftest-coverage 2090 'GCC_GENERATE_TEST_COVERAGE_FILES': 'YES', # -ftest-coverage
2091 }, 2091 },
(...skipping 1198 matching lines...) Expand 10 before | Expand all | Expand 10 after
3290 '-Wl,--no-keep-memory', 3290 '-Wl,--no-keep-memory',
3291 ], 3291 ],
3292 }], 3292 }],
3293 ], 3293 ],
3294 }], 3294 }],
3295 ], 3295 ],
3296 }], 3296 }],
3297 ['linux_use_heapchecker==1', { 3297 ['linux_use_heapchecker==1', {
3298 'variables': {'linux_use_tcmalloc%': 1}, 3298 'variables': {'linux_use_tcmalloc%': 1},
3299 'defines': [ 3299 'defines': [
3300 'USE_HEAPCHECKER' 3300 'USE_HEAPCHECKER',
3301 'MEMORY_TOOL_REPLACES_ALLOCATOR', 3301 'MEMORY_TOOL_REPLACES_ALLOCATOR',
3302 ], 3302 ],
3303 'conditions': [ 3303 'conditions': [
3304 ['component=="shared_library"', { 3304 ['component=="shared_library"', {
3305 # See crbug.com/112389 3305 # See crbug.com/112389
3306 # TODO(glider): replace with --dynamic-list or something 3306 # TODO(glider): replace with --dynamic-list or something
3307 'ldflags': ['-rdynamic'], 3307 'ldflags': ['-rdynamic'],
3308 }], 3308 }],
3309 ], 3309 ],
3310 }], 3310 }],
(...skipping 1257 matching lines...) Expand 10 before | Expand all | Expand 10 after
4568 # settings in target dicts. SYMROOT is a special case, because many other 4568 # settings in target dicts. SYMROOT is a special case, because many other
4569 # Xcode variables depend on it, including variables such as 4569 # Xcode variables depend on it, including variables such as
4570 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4570 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4571 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4571 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4572 # files to appear (when present) in the UI as actual files and not red 4572 # files to appear (when present) in the UI as actual files and not red
4573 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4573 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4574 # and therefore SYMROOT, needs to be set at the project level. 4574 # and therefore SYMROOT, needs to be set at the project level.
4575 'SYMROOT': '<(DEPTH)/xcodebuild', 4575 'SYMROOT': '<(DEPTH)/xcodebuild',
4576 }, 4576 },
4577 } 4577 }
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