summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Sollenberger <djsollen@google.com>2014-10-20 16:26:24 -0400
committerDerek Sollenberger <djsollen@google.com>2014-10-20 16:26:24 -0400
commit5865172542d5a0b577edd1a32bbb1753d4418362 (patch)
tree769f53a90c3f884bd93d5b69dc3293868570217f
parent17debef4c5bd23c98eba27343f89c3eabab0b1ae (diff)
downloadframeworks_base-5865172542d5a0b577edd1a32bbb1753d4418362.zip
frameworks_base-5865172542d5a0b577edd1a32bbb1753d4418362.tar.gz
frameworks_base-5865172542d5a0b577edd1a32bbb1753d4418362.tar.bz2
Add back include that ensures RENDER_TEXT_AS_GLYPHS is set consistently.
bug: 18051326 Change-Id: I1ee9f8acb25fb1684e156c61e2cf2669d15a99cb
-rw-r--r--libs/hwui/font/FontUtil.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/libs/hwui/font/FontUtil.h b/libs/hwui/font/FontUtil.h
index e302afb..f23ccbe 100644
--- a/libs/hwui/font/FontUtil.h
+++ b/libs/hwui/font/FontUtil.h
@@ -19,6 +19,8 @@
#include <SkUtils.h>
+#include "Properties.h"
+
///////////////////////////////////////////////////////////////////////////////
// Defines
///////////////////////////////////////////////////////////////////////////////
@@ -49,6 +51,7 @@
return g;
}
#else
+#error here
typedef SkUnichar glyph_t;
#define TO_GLYPH(g) ((SkUnichar) g)
#define GET_METRICS(cache, glyph) cache->getUnicharMetrics(glyph)