From ee101a3c6627e7cf871f81583bb62f719485a2bd Mon Sep 17 00:00:00 2001 From: Raph Levien Date: Tue, 31 Mar 2015 10:42:05 -0700 Subject: [PATCH] Remove unused constants in android_text_StaticLayout.cpp The logic for computing line breaking moved to Minikin, and so the various Unicode characters with special meaning for line breaks are no longer used in android_text_StaticLayout.cpp (which is now a fairly thin wrapper that just does JNI glue). This patch deletes the constants, which makes the warnings-as-errors setting of our current clang build happy. Change-Id: I1bb3596ca4f0c78a8e185af9000c0c366fb9b020 --- core/jni/android_text_StaticLayout.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/core/jni/android_text_StaticLayout.cpp b/core/jni/android_text_StaticLayout.cpp index c02002018564c..87c58d62dee84 100644 --- a/core/jni/android_text_StaticLayout.cpp +++ b/core/jni/android_text_StaticLayout.cpp @@ -48,11 +48,6 @@ struct JLineBreaksID { static jclass gLineBreaks_class; static JLineBreaksID gLineBreaks_fieldID; -static const int CHAR_SPACE = 0x20; -static const int CHAR_TAB = 0x09; -static const int CHAR_NEWLINE = 0x0a; -static const int CHAR_ZWSP = 0x200b; - // set text and set a number of parameters for creating a layout (width, tabstops, strategy) static void nSetupParagraph(JNIEnv* env, jclass, jlong nativePtr, jcharArray text, jint length, jfloat firstWidth, jint firstWidthLineLimit, jfloat restWidth,