| OLD | NEW |
| 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 3870 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3881 'target_conditions': [ | 3881 'target_conditions': [ |
| 3882 ['_toolset=="target"', { | 3882 ['_toolset=="target"', { |
| 3883 'ldflags!': [ | 3883 'ldflags!': [ |
| 3884 # Functions interposed by the sanitizers can make ld think | 3884 # Functions interposed by the sanitizers can make ld think |
| 3885 # that some libraries aren't needed when they actually are, | 3885 # that some libraries aren't needed when they actually are, |
| 3886 # http://crbug.com/234010. As workaround, disable --as-needed. | 3886 # http://crbug.com/234010. As workaround, disable --as-needed. |
| 3887 '-Wl,--as-needed', | 3887 '-Wl,--as-needed', |
| 3888 ], | 3888 ], |
| 3889 'defines': [ | 3889 'defines': [ |
| 3890 'MEMORY_TOOL_REPLACES_ALLOCATOR', | 3890 'MEMORY_TOOL_REPLACES_ALLOCATOR', |
| 3891 'MEMORY_SANITIZER_INITIAL_SIZE', |
| 3891 ], | 3892 ], |
| 3892 }], | 3893 }], |
| 3893 ], | 3894 ], |
| 3894 # TODO(glider): enable the default options on other systems. | 3895 # TODO(glider): enable the default options on other systems. |
| 3895 'conditions': [ | 3896 'conditions': [ |
| 3896 ['use_sanitizer_options==1 and OS=="linux" and (chromeos==0 or tar
get_arch!="ia32")', { | 3897 ['use_sanitizer_options==1 and OS=="linux" and (chromeos==0 or tar
get_arch!="ia32")', { |
| 3897 'dependencies': [ | 3898 'dependencies': [ |
| 3898 '<(DEPTH)/base/base.gyp:sanitizer_options', | 3899 '<(DEPTH)/base/base.gyp:sanitizer_options', |
| 3899 ], | 3900 ], |
| 3900 }], | 3901 }], |
| (...skipping 1646 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5547 # settings in target dicts. SYMROOT is a special case, because many other | 5548 # settings in target dicts. SYMROOT is a special case, because many other |
| 5548 # Xcode variables depend on it, including variables such as | 5549 # Xcode variables depend on it, including variables such as |
| 5549 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 5550 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 5550 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5551 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 5551 # files to appear (when present) in the UI as actual files and not red | 5552 # files to appear (when present) in the UI as actual files and not red |
| 5552 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5553 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 5553 # and therefore SYMROOT, needs to be set at the project level. | 5554 # and therefore SYMROOT, needs to be set at the project level. |
| 5554 'SYMROOT': '<(DEPTH)/xcodebuild', | 5555 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 5555 }, | 5556 }, |
| 5556 } | 5557 } |
| OLD | NEW |