diff options
| -rw-r--r-- | benchmarks/src/benchmarks/regression/BreakIteratorBenchmark.java | 6 | ||||
| -rw-r--r-- | jarjar-rules.txt | 2 | ||||
| -rw-r--r-- | luni/src/main/java/java/lang/System.java | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/benchmarks/src/benchmarks/regression/BreakIteratorBenchmark.java b/benchmarks/src/benchmarks/regression/BreakIteratorBenchmark.java index b58077d..8602ddc 100644 --- a/benchmarks/src/benchmarks/regression/BreakIteratorBenchmark.java +++ b/benchmarks/src/benchmarks/regression/BreakIteratorBenchmark.java @@ -61,11 +61,11 @@ public final class BreakIteratorBenchmark extends SimpleBenchmark { public void timeIcuBreakIterator(int nreps) { for (int i = 0; i < nreps; ++i) { - com.android.ibm.icu.text.BreakIterator it = - com.android.ibm.icu.text.BreakIterator.getLineInstance(text.locale); + android.icu.text.BreakIterator it = + android.icu.text.BreakIterator.getLineInstance(text.locale); it.setText(text.text); - while (it.next() != com.android.ibm.icu.text.BreakIterator.DONE) { + while (it.next() != android.icu.text.BreakIterator.DONE) { } } } diff --git a/jarjar-rules.txt b/jarjar-rules.txt index 4f0e036..b2da6eb 100644 --- a/jarjar-rules.txt +++ b/jarjar-rules.txt @@ -1 +1 @@ -rule com.ibm.icu.** com.android.ibm.icu.@1 +rule com.ibm.icu.** android.icu.@1 diff --git a/luni/src/main/java/java/lang/System.java b/luni/src/main/java/java/lang/System.java index 1ccda16..39f79b0 100644 --- a/luni/src/main/java/java/lang/System.java +++ b/luni/src/main/java/java/lang/System.java @@ -801,7 +801,7 @@ public final class System { // is prioritized over the properties in ICUConfig.properties. The issue with using // that is that it doesn't play well with jarjar and it needs complicated build rules // to change its default value. - p.put("com.android.ibm.icu.impl.ICUBinary.dataPath", getenv("ANDROID_ROOT") + "/usr/icu"); + p.put("android.icu.impl.ICUBinary.dataPath", getenv("ANDROID_ROOT") + "/usr/icu"); parsePropertyAssignments(p, specialProperties()); |