| 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 2873 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2884 }, { | 2884 }, { |
| 2885 'defines': [ | 2885 'defines': [ |
| 2886 'MEMORY_TOOL_REPLACES_ALLOCATOR', | 2886 'MEMORY_TOOL_REPLACES_ALLOCATOR', |
| 2887 'DYNAMIC_ANNOTATIONS_ENABLED=1', | 2887 'DYNAMIC_ANNOTATIONS_ENABLED=1', |
| 2888 'WTF_USE_DYNAMIC_ANNOTATIONS=1', | 2888 'WTF_USE_DYNAMIC_ANNOTATIONS=1', |
| 2889 ], | 2889 ], |
| 2890 }], | 2890 }], |
| 2891 ['win_use_allocator_shim==0', { | 2891 ['win_use_allocator_shim==0', { |
| 2892 'defines': ['NO_TCMALLOC'], | 2892 'defines': ['NO_TCMALLOC'], |
| 2893 }], | 2893 }], |
| 2894 ['os_posix==1', { | 2894 # _FORTIFY_SOURCE isn't really supported by Clang now, see |
| 2895 # http://llvm.org/bugs/show_bug.cgi?id=16821. |
| 2896 # TODO(glider): once the bug is fixed, disable source fortification |
| 2897 # under the sanitizer tools only. |
| 2898 ['os_posix==1 and (OS!="linux" or clang!=1)', { |
| 2895 'target_conditions': [ | 2899 'target_conditions': [ |
| 2896 ['chromium_code==1', { | 2900 ['chromium_code==1', { |
| 2897 # Non-chromium code is not guaranteed to compile cleanly | 2901 # Non-chromium code is not guaranteed to compile cleanly |
| 2898 # with _FORTIFY_SOURCE. Also, fortified build may fail | 2902 # with _FORTIFY_SOURCE. Also, fortified build may fail |
| 2899 # when optimizations are disabled, so only do that for Release | 2903 # when optimizations are disabled, so only do that for Release |
| 2900 # build. | 2904 # build. |
| 2901 'defines': [ | 2905 'defines': [ |
| 2902 '_FORTIFY_SOURCE=2', | 2906 '_FORTIFY_SOURCE=2', |
| 2903 ], | 2907 ], |
| 2904 }], | 2908 }], |
| (...skipping 2079 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4984 # settings in target dicts. SYMROOT is a special case, because many other | 4988 # settings in target dicts. SYMROOT is a special case, because many other |
| 4985 # Xcode variables depend on it, including variables such as | 4989 # Xcode variables depend on it, including variables such as |
| 4986 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 4990 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 4987 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 4991 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 4988 # files to appear (when present) in the UI as actual files and not red | 4992 # files to appear (when present) in the UI as actual files and not red |
| 4989 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 4993 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 4990 # and therefore SYMROOT, needs to be set at the project level. | 4994 # and therefore SYMROOT, needs to be set at the project level. |
| 4991 'SYMROOT': '<(DEPTH)/xcodebuild', | 4995 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 4992 }, | 4996 }, |
| 4993 } | 4997 } |
| OLD | NEW |