Index: skia/config/SkUserConfig.h |
diff --git a/skia/config/SkUserConfig.h b/skia/config/SkUserConfig.h |
index 8b4046a602b582aed10d9e476ffe6464fdce16e9..1bb131ae06e8efad1e5cc688ca058c21398728e3 100644 |
--- a/skia/config/SkUserConfig.h |
+++ b/skia/config/SkUserConfig.h |
@@ -197,14 +197,14 @@ SK_API void SkDebugf_FileLine(const char* file, int line, bool fatal, |
#define SK_CPU_LENDIAN |
#undef SK_CPU_BENDIAN |
-#elif defined(SK_BUILD_FOR_UNIX) |
+#elif defined(SK_BUILD_FOR_UNIX) || defined(SK_BUILD_FOR_ANDROID) |
// Prefer FreeType's emboldening algorithm to Skia's |
// TODO: skia used to just use hairline, but has improved since then, so |
// we should revisit this choice... |
#define SK_USE_FREETYPE_EMBOLDEN |
-#ifdef SK_CPU_BENDIAN |
+#if defined(SK_BUILD_FOR_UNIX) && defined(SK_CPU_BENDIAN) |
// Above we set the order for ARGB channels in registers. I suspect that, on |
// big endian machines, you can keep this the same and everything will work. |
// The in-memory order will be different, of course, but as long as everything |