diff options
| author |  scroggo <scroggo@google.com> | 2015-02-10 08:13:26 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-02-10 08:13:26 -0800 |
| commit | ac928f27ab632784d6b9572901201caa2908caa5 (patch) | |
| tree | c972afd08368529234165636fc0475c833d6c737 /gyp | |
| parent | eb2be7fa4413a566212782d8efae5dc225002821 (diff) | |
Only define SK_CRASH_HANDLER in crash_handler.
The macro is only used in CrashHandler.*
Removes SK_CRASH_HANDLER from Android's SkUserConfig, where it is not
needed.
Review URL: https://codereview.chromium.org/915663002
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/common_conditions.gypi | 4 | ||||
| -rw-r--r-- | gyp/tools.gyp | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index 15db2a61e8..9e8ce3ffbf 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -659,10 +659,6 @@ ], }], - [ 'skia_is_bot', { - 'defines': [ 'SK_CRASH_HANDLER' ], - }], - ], # end 'conditions' # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details 'xcode_settings': { diff --git a/gyp/tools.gyp b/gyp/tools.gyp index a83522c0db..21d9c02db8 100644 --- a/gyp/tools.gyp +++ b/gyp/tools.gyp @@ -50,6 +50,12 @@ 'direct_dependent_settings': { 'include_dirs': [ '../tools' ], }, + 'conditions': [ + [ 'skia_is_bot', { + 'defines': [ 'SK_CRASH_HANDLER' ], + }], + ], + 'all_dependent_settings': { 'msvs_settings': { 'VCLinkerTool': { |