Merge "Track movement of ICU .dat file"
diff --git a/app/Android.bp b/app/Android.bp
index a74ca7e..93cfddd 100644
--- a/app/Android.bp
+++ b/app/Android.bp
@@ -23,7 +23,7 @@
// pulled in by the build system (and thus sadly must be repeated).
shared_libs: [
"liblog",
- "libicuuc",
+ "libandroidicu",
],
srcs: ["HyphTool.cpp"],
diff --git a/app/HyphTool.cpp b/app/HyphTool.cpp
index 33d42b4..7cb778a 100644
--- a/app/HyphTool.cpp
+++ b/app/HyphTool.cpp
@@ -3,7 +3,6 @@
#include <cstdio>
#include <vector>
-#include <unicode/locid.h>
#include <utils/Log.h>
#include "minikin/Hyphenator.h"
diff --git a/libs/minikin/Android.bp b/libs/minikin/Android.bp
index 708b360..037b12f 100644
--- a/libs/minikin/Android.bp
+++ b/libs/minikin/Android.bp
@@ -83,14 +83,14 @@
},
shared_libs: [
"liblog",
- "libicuuc",
+ "libandroidicu",
],
header_libs: [
"libbase_headers",
"libminikin_headers",
],
export_header_lib_headers: ["libminikin_headers"],
- export_shared_lib_headers: ["libicuuc"],
+ export_shared_lib_headers: ["libandroidicu"],
whole_static_libs: ["libgtest_prod"],
clang: true,
diff --git a/libs/minikin/FontCollection.cpp b/libs/minikin/FontCollection.cpp
index 3d44ab5..1bf2668 100644
--- a/libs/minikin/FontCollection.cpp
+++ b/libs/minikin/FontCollection.cpp
@@ -21,7 +21,6 @@
#include <algorithm>
#include <log/log.h>
-#include <unicode/unistr.h>
#include <unicode/unorm2.h>
#include "minikin/Emoji.h"
diff --git a/tests/perftests/Android.bp b/tests/perftests/Android.bp
index 617560d..83db1c5 100644
--- a/tests/perftests/Android.bp
+++ b/tests/perftests/Android.bp
@@ -42,7 +42,7 @@
shared_libs: [
"libft2",
"libharfbuzz_ng",
- "libicuuc",
+ "libandroidicu",
"liblog",
],
diff --git a/tests/stresstest/Android.bp b/tests/stresstest/Android.bp
index 3b132ed..fb73e09 100644
--- a/tests/stresstest/Android.bp
+++ b/tests/stresstest/Android.bp
@@ -32,7 +32,7 @@
"libft2",
"libharfbuzz_ng",
- "libicuuc",
+ "libandroidicu",
"liblog",
"libutils",
"libz",
diff --git a/tests/unittest/Android.bp b/tests/unittest/Android.bp
index 02bec1e..4f5ae23 100644
--- a/tests/unittest/Android.bp
+++ b/tests/unittest/Android.bp
@@ -32,7 +32,7 @@
shared_libs: [
"libft2",
"libharfbuzz_ng",
- "libicuuc",
+ "libandroidicu",
"liblog",
"libutils",
"libz",
diff --git a/tests/unittest/WordBreakerTests.cpp b/tests/unittest/WordBreakerTests.cpp
index ee01d09..26e7c19 100644
--- a/tests/unittest/WordBreakerTests.cpp
+++ b/tests/unittest/WordBreakerTests.cpp
@@ -19,7 +19,6 @@
#include <cstdio>
#include <gtest/gtest.h>
-#include <unicode/locid.h>
#include <unicode/uclean.h>
#include <unicode/udata.h>
