summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author vichang <vichang@google.com> 2018-11-28 07:50:41 -0800
committer android-build-merger <android-build-merger@google.com> 2018-11-28 07:50:41 -0800
commit9a827ab8c1bde5179df10f8d1065bc6a7ea6c60c (patch)
tree82260b6b3eb67745df9d2b705ad2224c9685965d
parentd637e9e489aa3872c9ee5135047040710739c81f (diff)
parent0a4727721a31e0b5bd455c672cc4d611c7ff218e (diff)
Merge "Remove unused ICU4C headers included in android.text" am: 19d489d8cf
am: 0a4727721a Change-Id: I0e1fa80eb5ddadab6b1397d47f4fc1d9b7f33442
-rw-r--r--core/jni/android_text_MeasuredParagraph.cpp2
-rw-r--r--core/jni/android_text_StaticLayout.cpp2
2 files changed, 0 insertions, 4 deletions
diff --git a/core/jni/android_text_MeasuredParagraph.cpp b/core/jni/android_text_MeasuredParagraph.cpp
index 9eb6f8d4189a..1cb25957747d 100644
--- a/core/jni/android_text_MeasuredParagraph.cpp
+++ b/core/jni/android_text_MeasuredParagraph.cpp
@@ -17,8 +17,6 @@
#define LOG_TAG "MeasuredParagraph"
#include "GraphicsJNI.h"
-#include "unicode/locid.h"
-#include "unicode/brkiter.h"
#include "utils/misc.h"
#include "utils/Log.h"
#include <nativehelper/ScopedStringChars.h>
diff --git a/core/jni/android_text_StaticLayout.cpp b/core/jni/android_text_StaticLayout.cpp
index dfb57696dbcc..24baba4512c1 100644
--- a/core/jni/android_text_StaticLayout.cpp
+++ b/core/jni/android_text_StaticLayout.cpp
@@ -16,8 +16,6 @@
#define LOG_TAG "StaticLayout"
-#include "unicode/locid.h"
-#include "unicode/brkiter.h"
#include "utils/misc.h"
#include "utils/Log.h"
#include <nativehelper/ScopedStringChars.h>