Cherry-pick: Define SK_USE_FREETYPE_EMBOLDEN on Android
(From https://codereview.chromium.org/411313002/ by h.joshi@samsung.com:
Colored Emoji not drawn in Chrome if font style is set as Bold.
When Bold font is asked, then Skia try to generate image/bitmap from
path (if Bold font is not present) which is not correct case for Colored
Emoji bitmap font.)
Define SK_USE_FREETYPE_EMBOLDEN to prefer FreeType's emboldeing
algorithm to Skia's.
BUG=397069
R=h.joshi
TBR=bungeman
Review URL: https://codereview.chromium.org/800133008
Cr-Commit-Position: refs/heads/master@{#310662}
Bug: 19346255
Change-Id: If83ba41f203f4acdb9021bff32c351e86d4afa2d
diff --git a/skia/config/SkUserConfig.h b/skia/config/SkUserConfig.h
index 887d37a..1485f22 100644
--- a/skia/config/SkUserConfig.h
+++ b/skia/config/SkUserConfig.h
@@ -197,14 +197,14 @@
#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
