diff options
| author | pmonette <pmonette@chromium.org> | 2016-01-07 16:21:16 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-08 00:22:31 +0000 |
| commit | 502a83e013988cb8202844650e0e423ec2d8ee78 (patch) | |
| tree | bec66a12ca8a6b9edd9a657431db9e1f94ba7adf /build/common.gypi | |
| parent | ab0c1304c9f3b0c248f154680db5449f1a5497c8 (diff) | |
| download | chromium_src-502a83e013988cb8202844650e0e423ec2d8ee78.zip chromium_src-502a83e013988cb8202844650e0e423ec2d8ee78.tar.gz chromium_src-502a83e013988cb8202844650e0e423ec2d8ee78.tar.bz2 | |
Switched Kasko to use the new buildflag system.
Moved gyp build to third_party/kasko
Also fixed some build issues that came with rebasing to tip of tree.
Review URL: https://codereview.chromium.org/1526213002
Cr-Commit-Position: refs/heads/master@{#368212}
Diffstat (limited to 'build/common.gypi')
| -rw-r--r-- | build/common.gypi | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/build/common.gypi b/build/common.gypi index 9bf1997..dbb7669 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -482,6 +482,9 @@ # Enable crash reporting via Kasko. 'kasko%': 0, + # Enable hang reports in Kasko. + 'kasko_hang_reports%': 0, + # Enable building with LSan (Clang's -fsanitize=leak option). # -fsanitize=leak only works with clang, but lsan=1 implies clang=1 # See https://sites.google.com/a/chromium.org/dev/developers/testing/leaksanitizer @@ -1192,6 +1195,7 @@ 'use_sanitizer_options%': '<(use_sanitizer_options)', 'syzyasan%': '<(syzyasan)', 'kasko%': '<(kasko)', + 'kasko_hang_reports%': '<(kasko_hang_reports)', 'syzygy_optimize%': '<(syzygy_optimize)', 'lsan%': '<(lsan)', 'msan%': '<(msan)', @@ -2891,14 +2895,6 @@ 'MEMORY_SANITIZER_INITIAL_SIZE', ], }], - ['kasko==1', { - 'defines': [ - 'KASKO', - ], - 'include_dirs': [ - '<(DEPTH)/third_party/kasko/include', - ], - }], ['OS=="win"', { 'defines': [ '__STD_C', |