diff options
| author |  bsalomon <bsalomon@google.com> | 2016-03-02 14:44:15 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-02 14:44:15 -0800 |
| commit | ad514d00e5a65dadf9040d0cde4b897f565b5c19 (patch) | |
| tree | 2c50f886f2b2e6694932d15e5b315e5b14fd49be | |
| parent | e506ee6b7c9527383c96c0c2a3cd6ee35c930c6f (diff) | |
Only modify abort behavior to avoid debugger dialog on windows for bot builds.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1752973003
Review URL: https://codereview.chromium.org/1752973003
| -rw-r--r-- | gyp/common_conditions.gypi | 3 | ||||
| -rw-r--r-- | src/ports/SkMemory_malloc.cpp | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index 85f3e20376..c0b901eb00 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -12,6 +12,9 @@ 'SK_FORCE_DISTANCE_FIELD_TEXT=<(skia_force_distance_field_text)', ], 'conditions' : [ + [ 'skia_is_bot', { + 'defines': [ 'SK_IS_BOT' ], + }], [ 'skia_codec_decodes_raw', { 'defines': [ 'SK_CODEC_DECODES_RAW', diff --git a/src/ports/SkMemory_malloc.cpp b/src/ports/SkMemory_malloc.cpp index 9fc17b7c34..2fc59f9b92 100644 --- a/src/ports/SkMemory_malloc.cpp +++ b/src/ports/SkMemory_malloc.cpp @@ -27,7 +27,7 @@ static inline void* throw_on_failure(size_t size, void* p) { } void sk_abort_no_print() { -#ifdef SK_BUILD_FOR_WIN +#if defined(SK_BUILD_FOR_WIN) && defined(SK_IS_BOT) // do not display a system dialog before aborting the process _set_abort_behavior(0, _WRITE_ABORT_MSG); #endif |