diff options
| author | Narayan Kamath <narayan@google.com> | 2015-03-31 09:01:13 +0000 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2015-03-31 09:01:13 +0000 |
| commit | 3b59929cb9978453c8bc81cf7e222c40fa42ce90 (patch) | |
| tree | a39042db374d8cd375547c0ab3936d667a7243b3 /benchmarks | |
| parent | de7c1fb9684c2558743e88fbf74a61f5ed6b47b5 (diff) | |
| download | libcore-3b59929cb9978453c8bc81cf7e222c40fa42ce90.zip libcore-3b59929cb9978453c8bc81cf7e222c40fa42ce90.tar.gz libcore-3b59929cb9978453c8bc81cf7e222c40fa42ce90.tar.bz2 | |
Revert "Add icu4j to core-libart.jar."
This reverts commit de7c1fb9684c2558743e88fbf74a61f5ed6b47b5.
Change-Id: I22be183176e27371b3ab5fd8868598968cf01584
Diffstat (limited to 'benchmarks')
| -rw-r--r-- | benchmarks/Android.mk | 3 | ||||
| -rw-r--r-- | benchmarks/src/benchmarks/regression/BreakIteratorBenchmark.java | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/benchmarks/Android.mk b/benchmarks/Android.mk index 9e65091..e396766 100644 --- a/benchmarks/Android.mk +++ b/benchmarks/Android.mk @@ -21,7 +21,8 @@ ifeq ($(LIBCORE_SKIP_TESTS),) include $(CLEAR_VARS) LOCAL_MODULE := benchmarks LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_STATIC_JAVA_LIBRARIES := caliper-prebuilt mockwebserver core-tests-support +# TODO: Remove icu4j from this deps list once it's in the boot classpath. +LOCAL_STATIC_JAVA_LIBRARIES := caliper-prebuilt mockwebserver core-tests-support icu4j LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_JAVA_LIBRARIES := core-libart conscrypt core-junit bouncycastle framework LOCAL_MODULE_TAGS := tests diff --git a/benchmarks/src/benchmarks/regression/BreakIteratorBenchmark.java b/benchmarks/src/benchmarks/regression/BreakIteratorBenchmark.java index b58077d..1dcafa6 100644 --- a/benchmarks/src/benchmarks/regression/BreakIteratorBenchmark.java +++ b/benchmarks/src/benchmarks/regression/BreakIteratorBenchmark.java @@ -61,11 +61,10 @@ 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); + com.ibm.icu.text.BreakIterator it = com.ibm.icu.text.BreakIterator.getLineInstance(text.locale); it.setText(text.text); - while (it.next() != com.android.ibm.icu.text.BreakIterator.DONE) { + while (it.next() != com.ibm.icu.text.BreakIterator.DONE) { } } } |