| 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 2190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2201 '-Xclang', '-add-plugin', '-Xclang', '<(clang_add_plugin)', | 2201 '-Xclang', '-add-plugin', '-Xclang', '<(clang_add_plugin)', |
| 2202 ], | 2202 ], |
| 2203 }], | 2203 }], |
| 2204 ['clang==1 and "<(GENERATOR)"=="ninja"', { | 2204 ['clang==1 and "<(GENERATOR)"=="ninja"', { |
| 2205 'cflags': [ | 2205 'cflags': [ |
| 2206 # See http://crbug.com/110262 | 2206 # See http://crbug.com/110262 |
| 2207 '-fcolor-diagnostics', | 2207 '-fcolor-diagnostics', |
| 2208 ], | 2208 ], |
| 2209 }], | 2209 }], |
| 2210 ['asan==1', { | 2210 ['asan==1', { |
| 2211 'cflags': [ | 2211 'target_conditions': [ |
| 2212 '-faddress-sanitizer', | 2212 ['_toolset=="target"', { |
| 2213 '-fno-omit-frame-pointer', | 2213 'cflags': [ |
| 2214 '-w', | 2214 '-faddress-sanitizer', |
| 2215 ], | 2215 '-fno-omit-frame-pointer', |
| 2216 'ldflags': [ | 2216 '-w', |
| 2217 '-faddress-sanitizer', | 2217 ], |
| 2218 ], | 2218 'ldflags': [ |
| 2219 'defines': [ | 2219 '-faddress-sanitizer', |
| 2220 'ADDRESS_SANITIZER', | 2220 ], |
| 2221 'defines': [ |
| 2222 'ADDRESS_SANITIZER', |
| 2223 ], |
| 2224 }], |
| 2221 ], | 2225 ], |
| 2222 }], | 2226 }], |
| 2223 ['order_profiling!=0 and (chromeos==1 or OS=="linux")', { | 2227 ['order_profiling!=0 and (chromeos==1 or OS=="linux")', { |
| 2224 'target_conditions' : [ | 2228 'target_conditions' : [ |
| 2225 ['_toolset=="target"', { | 2229 ['_toolset=="target"', { |
| 2226 'cflags': [ | 2230 'cflags': [ |
| 2227 '-finstrument-functions', | 2231 '-finstrument-functions', |
| 2228 ], | 2232 ], |
| 2229 }], | 2233 }], |
| 2230 ], | 2234 ], |
| (...skipping 859 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3090 # settings in target dicts. SYMROOT is a special case, because many other | 3094 # settings in target dicts. SYMROOT is a special case, because many other |
| 3091 # Xcode variables depend on it, including variables such as | 3095 # Xcode variables depend on it, including variables such as |
| 3092 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 3096 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 3093 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 3097 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 3094 # files to appear (when present) in the UI as actual files and not red | 3098 # files to appear (when present) in the UI as actual files and not red |
| 3095 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 3099 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 3096 # and therefore SYMROOT, needs to be set at the project level. | 3100 # and therefore SYMROOT, needs to be set at the project level. |
| 3097 'SYMROOT': '<(DEPTH)/xcodebuild', | 3101 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 3098 }, | 3102 }, |
| 3099 } | 3103 } |
| OLD | NEW |