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

Side by Side Diff: build/common.gypi

Issue 167773002: Make SyzyAsan depend on 'syzyasan' GYP flag instead of 'asan==1 and OS=="win"' (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 10 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
« no previous file with comments | « build/all.gyp ('k') | chrome/chrome_syzygy.gyp » ('j') | 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 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 'clang_use_chrome_plugins%': 1, 339 'clang_use_chrome_plugins%': 1,
340 340
341 # Enable building with ASAN (Clang's -fsanitize=address option). 341 # Enable building with ASAN (Clang's -fsanitize=address option).
342 # -fsanitize=address only works with clang, but asan=1 implies clang=1 342 # -fsanitize=address only works with clang, but asan=1 implies clang=1
343 # See https://sites.google.com/a/chromium.org/dev/developers/testing/addre sssanitizer 343 # See https://sites.google.com/a/chromium.org/dev/developers/testing/addre sssanitizer
344 'asan%': 0, 344 'asan%': 0,
345 # Enable coverage gathering instrumentation in ASan. This flag also 345 # Enable coverage gathering instrumentation in ASan. This flag also
346 # controls coverage granularity (experimental). 346 # controls coverage granularity (experimental).
347 'asan_coverage%': 0, 347 'asan_coverage%': 0,
348 348
349 # Enable building with SyzyAsan.
350 # See https://code.google.com/p/sawbuck/wiki/SyzyASanHowTo
351 'syzyasan%': 0,
352
349 # Enable building with LSan (Clang's -fsanitize=leak option). 353 # Enable building with LSan (Clang's -fsanitize=leak option).
350 # -fsanitize=leak only works with clang, but lsan=1 implies clang=1 354 # -fsanitize=leak only works with clang, but lsan=1 implies clang=1
351 # See https://sites.google.com/a/chromium.org/dev/developers/testing/leaks anitizer 355 # See https://sites.google.com/a/chromium.org/dev/developers/testing/leaks anitizer
352 'lsan%': 0, 356 'lsan%': 0,
353 357
354 # Enable building with TSAN (Clang's -fsanitize=thread option). 358 # Enable building with TSAN (Clang's -fsanitize=thread option).
355 # -fsanitize=thread only works with clang, but tsan=1 implies clang=1 359 # -fsanitize=thread only works with clang, but tsan=1 implies clang=1
356 # See http://clang.llvm.org/docs/ThreadSanitizer.html 360 # See http://clang.llvm.org/docs/ThreadSanitizer.html
357 'tsan%': 0, 361 'tsan%': 0,
358 'tsan_blacklist%': '<(PRODUCT_DIR)/../../tools/valgrind/tsan_v2/ignores.tx t', 362 'tsan_blacklist%': '<(PRODUCT_DIR)/../../tools/valgrind/tsan_v2/ignores.tx t',
(...skipping 555 matching lines...) Expand 10 before | Expand all | Expand 10 after
914 'enable_webrtc%': '<(enable_webrtc)', 918 'enable_webrtc%': '<(enable_webrtc)',
915 'chromium_win_pch%': '<(chromium_win_pch)', 919 'chromium_win_pch%': '<(chromium_win_pch)',
916 'configuration_policy%': '<(configuration_policy)', 920 'configuration_policy%': '<(configuration_policy)',
917 'safe_browsing%': '<(safe_browsing)', 921 'safe_browsing%': '<(safe_browsing)',
918 'input_speech%': '<(input_speech)', 922 'input_speech%': '<(input_speech)',
919 'notifications%': '<(notifications)', 923 'notifications%': '<(notifications)',
920 'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)', 924 'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)',
921 'mac_want_real_dsym%': '<(mac_want_real_dsym)', 925 'mac_want_real_dsym%': '<(mac_want_real_dsym)',
922 'asan%': '<(asan)', 926 'asan%': '<(asan)',
923 'asan_coverage%': '<(asan_coverage)', 927 'asan_coverage%': '<(asan_coverage)',
928 'syzyasan%': '<(syzyasan)',
924 'lsan%': '<(lsan)', 929 'lsan%': '<(lsan)',
925 'msan%': '<(msan)', 930 'msan%': '<(msan)',
926 'msan_blacklist%': '<(msan_blacklist)', 931 'msan_blacklist%': '<(msan_blacklist)',
927 'tsan%': '<(tsan)', 932 'tsan%': '<(tsan)',
928 'tsan_blacklist%': '<(tsan_blacklist)', 933 'tsan_blacklist%': '<(tsan_blacklist)',
929 'use_instrumented_libraries%': '<(use_instrumented_libraries)', 934 'use_instrumented_libraries%': '<(use_instrumented_libraries)',
930 'use_custom_libcxx%': '<(use_custom_libcxx)', 935 'use_custom_libcxx%': '<(use_custom_libcxx)',
931 'clang_type_profiler%': '<(clang_type_profiler)', 936 'clang_type_profiler%': '<(clang_type_profiler)',
932 'order_profiling%': '<(order_profiling)', 937 'order_profiling%': '<(order_profiling)',
933 'order_text_section%': '<(order_text_section)', 938 'order_text_section%': '<(order_text_section)',
(...skipping 836 matching lines...) Expand 10 before | Expand all | Expand 10 after
1770 }], 1775 }],
1771 ['enable_task_manager==1', { 1776 ['enable_task_manager==1', {
1772 'grit_defines': ['-D', 'enable_task_manager'], 1777 'grit_defines': ['-D', 'enable_task_manager'],
1773 }], 1778 }],
1774 ['clang_use_chrome_plugins==1 and OS!="win"', { 1779 ['clang_use_chrome_plugins==1 and OS!="win"', {
1775 'clang_chrome_plugins_flags': [ 1780 'clang_chrome_plugins_flags': [
1776 '<!@(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)' 1781 '<!@(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)'
1777 ], 1782 ],
1778 }], 1783 }],
1779 1784
1785 ['asan==1 and OS=="win"', {
1786 # TODO(hans): Remove once users set syzyasan (crbug.com/343960).
1787 'syzyasan%': 1,
1788 }],
1780 ['asan==1 and OS!="win"', { 1789 ['asan==1 and OS!="win"', {
1790 # TODO(hans): Windows should use Clang-based ASan (crbug.com/343960).
1781 'clang%': 1, 1791 'clang%': 1,
1782 }], 1792 }],
1783 ['asan==1 and OS=="mac"', { 1793 ['asan==1 and OS=="mac"', {
1784 # TODO(glider): we do not strip ASan binaries until the dynamic ASan 1794 # TODO(glider): we do not strip ASan binaries until the dynamic ASan
1785 # runtime is fully adopted. See http://crbug.com/242503. 1795 # runtime is fully adopted. See http://crbug.com/242503.
1786 'mac_strip_release': 0, 1796 'mac_strip_release': 0,
1787 }], 1797 }],
1788 ['lsan==1', { 1798 ['lsan==1', {
1789 'clang%': 1, 1799 'clang%': 1,
1790 }], 1800 }],
(...skipping 523 matching lines...) Expand 10 before | Expand all | Expand 10 after
2314 ['use_openssl==1', { 2324 ['use_openssl==1', {
2315 'defines': [ 2325 'defines': [
2316 'USE_OPENSSL=1', 2326 'USE_OPENSSL=1',
2317 ], 2327 ],
2318 }], 2328 }],
2319 ['enable_eglimage==1', { 2329 ['enable_eglimage==1', {
2320 'defines': [ 2330 'defines': [
2321 'ENABLE_EGLIMAGE=1', 2331 'ENABLE_EGLIMAGE=1',
2322 ], 2332 ],
2323 }], 2333 }],
2324 ['asan==1 and OS=="win"', { 2334 ['syzyasan==1', {
2325 # Since asan on windows uses Syzygy, we need /PROFILE turned on to 2335 # SyzyAsan needs /PROFILE turned on to produce appropriate pdbs.
2326 # produce appropriate pdbs.
2327 'msvs_settings': { 2336 'msvs_settings': {
2328 'VCLinkerTool': { 2337 'VCLinkerTool': {
2329 'Profile': 'true', 2338 'Profile': 'true',
2330 }, 2339 },
2331 }, 2340 },
2332 'defines': [ 2341 'defines': [
2333 'ADDRESS_SANITIZER', 2342 'ADDRESS_SANITIZER',
2334 'MEMORY_TOOL_REPLACES_ALLOCATOR', 2343 'MEMORY_TOOL_REPLACES_ALLOCATOR',
2335 ], 2344 ],
2336 }], # asan==1 and OS=="win" 2345 }],
2337 ['OS=="win"', { 2346 ['OS=="win"', {
2338 'defines': [ 2347 'defines': [
2339 '__STD_C', 2348 '__STD_C',
2340 '_CRT_SECURE_NO_DEPRECATE', 2349 '_CRT_SECURE_NO_DEPRECATE',
2341 '_SCL_SECURE_NO_DEPRECATE', 2350 '_SCL_SECURE_NO_DEPRECATE',
2342 # This define is required to pull in the new Win8 interfaces from 2351 # This define is required to pull in the new Win8 interfaces from
2343 # system headers like ShObjIdl.h. 2352 # system headers like ShObjIdl.h.
2344 'NTDDI_VERSION=0x06020000', 2353 'NTDDI_VERSION=0x06020000',
2345 # This is required for ATL to use XP-safe versions of its functions. 2354 # This is required for ATL to use XP-safe versions of its functions.
2346 '_USING_V110_SDK71_', 2355 '_USING_V110_SDK71_',
(...skipping 2408 matching lines...) Expand 10 before | Expand all | Expand 10 after
4755 'msvs_settings': { 4764 'msvs_settings': {
4756 'VCLinkerTool': { 4765 'VCLinkerTool': {
4757 'AdditionalOptions': [ 4766 'AdditionalOptions': [
4758 '/safeseh', 4767 '/safeseh',
4759 '/dynamicbase', 4768 '/dynamicbase',
4760 '/ignore:4199', 4769 '/ignore:4199',
4761 '/ignore:4221', 4770 '/ignore:4221',
4762 '/nxcompat', 4771 '/nxcompat',
4763 ], 4772 ],
4764 'conditions': [ 4773 'conditions': [
4765 ['asan==0', { 4774 ['syzyasan==0', {
4766 'AdditionalOptions': ['/largeaddressaware'], 4775 'AdditionalOptions': ['/largeaddressaware'],
4767 }], 4776 }],
4768 ], 4777 ],
4769 }, 4778 },
4770 }, 4779 },
4771 }, 4780 },
4772 'x64_Base': { 4781 'x64_Base': {
4773 'msvs_settings': { 4782 'msvs_settings': {
4774 'VCLinkerTool': { 4783 'VCLinkerTool': {
4775 'AdditionalOptions': [ 4784 'AdditionalOptions': [
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
4910 # settings in target dicts. SYMROOT is a special case, because many other 4919 # settings in target dicts. SYMROOT is a special case, because many other
4911 # Xcode variables depend on it, including variables such as 4920 # Xcode variables depend on it, including variables such as
4912 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4921 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4913 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4922 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4914 # files to appear (when present) in the UI as actual files and not red 4923 # files to appear (when present) in the UI as actual files and not red
4915 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4924 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4916 # and therefore SYMROOT, needs to be set at the project level. 4925 # and therefore SYMROOT, needs to be set at the project level.
4917 'SYMROOT': '<(DEPTH)/xcodebuild', 4926 'SYMROOT': '<(DEPTH)/xcodebuild',
4918 }, 4927 },
4919 } 4928 }
OLDNEW
« no previous file with comments | « build/all.gyp ('k') | chrome/chrome_syzygy.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698