diff options
| author | Narayan Kamath <narayan@google.com> | 2015-04-01 09:34:24 +0100 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2015-04-01 09:36:05 +0100 |
| commit | f37f781d473cd398041e34648aaa5f2a50c0d8f5 (patch) | |
| tree | eb773c41ba5fce6c621e3b707a2e1bfeb4e039cd /benchmarks | |
| parent | f180cb21b5bd3e5fa314a5e259f192b663e72216 (diff) | |
| download | libcore-f37f781d473cd398041e34648aaa5f2a50c0d8f5.zip libcore-f37f781d473cd398041e34648aaa5f2a50c0d8f5.tar.gz libcore-f37f781d473cd398041e34648aaa5f2a50c0d8f5.tar.bz2 | |
Revert "Revert "Add icu4j to core-libart.jar.""
This reverts commit 3b59929cb9978453c8bc81cf7e222c40fa42ce90.
Fixes the original flaky build issues and fixes a typo caught
by the previous review.
Change-Id: Ia8a008b75dba51980b064f9689477b8698bcfa5c
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 e396766..9e65091 100644 --- a/benchmarks/Android.mk +++ b/benchmarks/Android.mk @@ -21,8 +21,7 @@ ifeq ($(LIBCORE_SKIP_TESTS),) include $(CLEAR_VARS) LOCAL_MODULE := benchmarks LOCAL_SRC_FILES := $(call all-java-files-under, src) -# 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_STATIC_JAVA_LIBRARIES := caliper-prebuilt mockwebserver core-tests-support 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 1dcafa6..b58077d 100644 --- a/benchmarks/src/benchmarks/regression/BreakIteratorBenchmark.java +++ b/benchmarks/src/benchmarks/regression/BreakIteratorBenchmark.java @@ -61,10 +61,11 @@ public final class BreakIteratorBenchmark extends SimpleBenchmark { public void timeIcuBreakIterator(int nreps) { for (int i = 0; i < nreps; ++i) { - com.ibm.icu.text.BreakIterator it = com.ibm.icu.text.BreakIterator.getLineInstance(text.locale); + com.android.ibm.icu.text.BreakIterator it = + com.android.ibm.icu.text.BreakIterator.getLineInstance(text.locale); it.setText(text.text); - while (it.next() != com.ibm.icu.text.BreakIterator.DONE) { + while (it.next() != com.android.ibm.icu.text.BreakIterator.DONE) { } } } |