aboutsummaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorGravatar benjaminwagner <benjaminwagner@google.com>2015-11-18 13:14:14 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2015-11-18 13:14:14 -0800
commit58afee8220b27f5a34f129f380f56b500da86c95 (patch)
tree87d163a11ecaac19dee2bcbe835449387f4a2f7b /include
parenta745186c939ec641a861c74064155ec4aa3beb33 (diff)
Fix GOOGLE3 Android build.
DebugWriteToStderr isn't defined for Android. I'm not sure if I just didn't test compiling for Android or if this is due to a change in the base library. BUG=skia: No public API changes. TBR=reed@google.com Review URL: https://codereview.chromium.org/1438773003
Diffstat (limited to 'include')
-rw-r--r--include/core/SkPostConfig.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/include/core/SkPostConfig.h b/include/core/SkPostConfig.h
index b994c05cef..d23eddf2e6 100644
--- a/include/core/SkPostConfig.h
+++ b/include/core/SkPostConfig.h
@@ -147,16 +147,20 @@
#
#endif
+#if defined(GOOGLE3)
+ // Used as argument to DumpStackTrace in SK_ALWAYSBREAK.
+ void SkDebugfForDumpStackTrace(const char* data, void* unused);
+#endif
+
#ifndef SK_ALWAYSBREAK
# if defined(GOOGLE3)
- void DebugWriteToStderr(const char*, void*);
void DumpStackTrace(int skip_count, void w(const char*, void*),
void* arg);
# define SK_ALWAYSBREAK(cond) do { \
if (cond) break; \
SkNO_RETURN_HINT(); \
SkDebugf("%s:%d: failed assertion \"%s\"\n", __FILE__, __LINE__, #cond); \
- DumpStackTrace(0, DebugWriteToStderr, nullptr); \
+ DumpStackTrace(0, SkDebugfForDumpStackTrace, nullptr); \
SK_CRASH(); \
} while (false)
# elif defined(SK_DEBUG)