| 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 2574 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2585 # See http://crbug.com/110262 | 2585 # See http://crbug.com/110262 |
| 2586 '-fcolor-diagnostics', | 2586 '-fcolor-diagnostics', |
| 2587 ], | 2587 ], |
| 2588 }], | 2588 }], |
| 2589 ['asan==1', { | 2589 ['asan==1', { |
| 2590 'target_conditions': [ | 2590 'target_conditions': [ |
| 2591 ['_toolset=="target"', { | 2591 ['_toolset=="target"', { |
| 2592 'cflags': [ | 2592 'cflags': [ |
| 2593 '-faddress-sanitizer', | 2593 '-faddress-sanitizer', |
| 2594 '-fno-omit-frame-pointer', | 2594 '-fno-omit-frame-pointer', |
| 2595 # See http://crbug.com/159580 |
| 2596 '-w', |
| 2595 ], | 2597 ], |
| 2596 'ldflags': [ | 2598 'ldflags': [ |
| 2597 '-faddress-sanitizer', | 2599 '-faddress-sanitizer', |
| 2598 ], | 2600 ], |
| 2599 'defines': [ | 2601 'defines': [ |
| 2600 'ADDRESS_SANITIZER', | 2602 'ADDRESS_SANITIZER', |
| 2601 ], | 2603 ], |
| 2602 }], | 2604 }], |
| 2603 ], | 2605 ], |
| 2604 }], | 2606 }], |
| 2605 ['tsan==1', { | 2607 ['tsan==1', { |
| 2606 'target_conditions': [ | 2608 'target_conditions': [ |
| 2607 ['_toolset=="target"', { | 2609 ['_toolset=="target"', { |
| 2608 'cflags': [ | 2610 'cflags': [ |
| 2609 '-fthread-sanitizer', | 2611 '-fthread-sanitizer', |
| 2610 '-fno-omit-frame-pointer', | 2612 '-fno-omit-frame-pointer', |
| 2611 '-fPIE', | 2613 '-fPIE', |
| 2612 '-mllvm', '-tsan-blacklist=<(tsan_blacklist)' | 2614 '-mllvm', '-tsan-blacklist=<(tsan_blacklist)' |
| 2615 # See http://crbug.com/159580 |
| 2616 '-w', |
| 2613 ], | 2617 ], |
| 2614 'ldflags': [ | 2618 'ldflags': [ |
| 2615 '-fthread-sanitizer', | 2619 '-fthread-sanitizer', |
| 2616 ], | 2620 ], |
| 2617 'defines': [ | 2621 'defines': [ |
| 2618 'THREAD_SANITIZER', | 2622 'THREAD_SANITIZER', |
| 2619 'DYNAMIC_ANNOTATIONS_EXTERNAL_IMPL=1', | 2623 'DYNAMIC_ANNOTATIONS_EXTERNAL_IMPL=1', |
| 2620 'WTF_USE_DYNAMIC_ANNOTATIONS_NOIMPL=1', | 2624 'WTF_USE_DYNAMIC_ANNOTATIONS_NOIMPL=1', |
| 2621 ], | 2625 ], |
| 2622 'target_conditions': [ | 2626 'target_conditions': [ |
| (...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3012 }], | 3016 }], |
| 3013 ], | 3017 ], |
| 3014 }], | 3018 }], |
| 3015 # Settings for building host targets using the system toolchain. | 3019 # Settings for building host targets using the system toolchain. |
| 3016 ['_toolset=="host"', { | 3020 ['_toolset=="host"', { |
| 3017 'cflags!': [ | 3021 'cflags!': [ |
| 3018 # Due to issues in Clang build system, using ASan on 32-bit | 3022 # Due to issues in Clang build system, using ASan on 32-bit |
| 3019 # binaries on x86_64 host is problematic. | 3023 # binaries on x86_64 host is problematic. |
| 3020 # TODO(eugenis): re-enable. | 3024 # TODO(eugenis): re-enable. |
| 3021 '-faddress-sanitizer', | 3025 '-faddress-sanitizer', |
| 3026 # See http://crbug.com/159580 |
| 3027 '-w', |
| 3022 ], | 3028 ], |
| 3023 'ldflags!': [ | 3029 'ldflags!': [ |
| 3024 '-faddress-sanitizer', | 3030 '-faddress-sanitizer', |
| 3025 '-Wl,-z,noexecstack', | 3031 '-Wl,-z,noexecstack', |
| 3026 '-Wl,--gc-sections', | 3032 '-Wl,--gc-sections', |
| 3027 '-Wl,-O1', | 3033 '-Wl,-O1', |
| 3028 '-Wl,--as-needed', | 3034 '-Wl,--as-needed', |
| 3029 ], | 3035 ], |
| 3030 'sources/': [ | 3036 'sources/': [ |
| 3031 ['exclude', '_android(_unittest)?\\.cc$'], | 3037 ['exclude', '_android(_unittest)?\\.cc$'], |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3131 'conditions': [ | 3137 'conditions': [ |
| 3132 ['clang==1', { | 3138 ['clang==1', { |
| 3133 'variables': { | 3139 'variables': { |
| 3134 'clang_dir': '../third_party/llvm-build/Release+Asserts/bin', | 3140 'clang_dir': '../third_party/llvm-build/Release+Asserts/bin', |
| 3135 }, | 3141 }, |
| 3136 }], | 3142 }], |
| 3137 ['asan==1', { | 3143 ['asan==1', { |
| 3138 'xcode_settings': { | 3144 'xcode_settings': { |
| 3139 'OTHER_CFLAGS': [ | 3145 'OTHER_CFLAGS': [ |
| 3140 '-faddress-sanitizer', | 3146 '-faddress-sanitizer', |
| 3147 # See http://crbug.com/159580 |
| 3148 '-w', |
| 3141 ], | 3149 ], |
| 3142 }, | 3150 }, |
| 3143 'defines': [ | 3151 'defines': [ |
| 3144 'ADDRESS_SANITIZER', | 3152 'ADDRESS_SANITIZER', |
| 3145 ], | 3153 ], |
| 3146 }], | 3154 }], |
| 3147 ], | 3155 ], |
| 3148 'target_conditions': [ | 3156 'target_conditions': [ |
| 3149 ['_type!="static_library"', { | 3157 ['_type!="static_library"', { |
| 3150 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-search_paths_first']}, | 3158 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-search_paths_first']}, |
| (...skipping 575 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3726 # settings in target dicts. SYMROOT is a special case, because many other | 3734 # settings in target dicts. SYMROOT is a special case, because many other |
| 3727 # Xcode variables depend on it, including variables such as | 3735 # Xcode variables depend on it, including variables such as |
| 3728 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 3736 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 3729 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 3737 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 3730 # files to appear (when present) in the UI as actual files and not red | 3738 # files to appear (when present) in the UI as actual files and not red |
| 3731 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 3739 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 3732 # and therefore SYMROOT, needs to be set at the project level. | 3740 # and therefore SYMROOT, needs to be set at the project level. |
| 3733 'SYMROOT': '<(DEPTH)/xcodebuild', | 3741 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 3734 }, | 3742 }, |
| 3735 } | 3743 } |
| OLD | NEW |