diff options
| author |  Mike Klein <mtklein@chromium.org> | 2017-12-19 09:09:33 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-12-19 14:42:16 +0000 |
| commit | 6613cc5186c200e053c5df9bd8f051ffba6e3564 (patch) | |
| tree | 1c7533d9f63a7a1805a96d8eb37bebf87ffc614f /tools | |
| parent | 84bfc9589878a95c2a017698398f153a53e54412 (diff) | |
GOOGLE3 -> SK_BUILD_FOR_GOOGLE3
This is more consistent with our other SK_BUILD_FOR_... macros,
and less likely to collide with other preprocessor logic.
(Luckily, this was defined in public.bzl, so we can do this
all in one CL in the Skia repo.)
Change-Id: I5f232888288c9c53fad445545d983d0fb0b4add8
Reviewed-on: https://skia-review.googlesource.com/86940
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/CrashHandler.cpp | 2 | ||||
| -rw-r--r-- | tools/SkJSONCPP.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/CrashHandler.cpp b/tools/CrashHandler.cpp index f141e55407..5fa6a10dc4 100644 --- a/tools/CrashHandler.cpp +++ b/tools/CrashHandler.cpp @@ -15,7 +15,7 @@ #ifndef SK_CRASH_HANDLER void SetupCrashHandler() { } -#elif defined(GOOGLE3) +#elif defined(SK_BUILD_FOR_GOOGLE3) #include "base/process_state.h" void SetupCrashHandler() { InstallSignalHandlers(); } diff --git a/tools/SkJSONCPP.h b/tools/SkJSONCPP.h index 6baf223610..32ae4950f3 100644 --- a/tools/SkJSONCPP.h +++ b/tools/SkJSONCPP.h @@ -10,7 +10,7 @@ #ifndef SkJSONCPP_DEFINED #define SkJSONCPP_DEFINED -#ifdef GOOGLE3 +#ifdef SK_BUILD_FOR_GOOGLE3 #include "third_party/jsoncpp/reader.h" #include "third_party/jsoncpp/value.h" #include "third_party/jsoncpp/writer.h" |