diff options
| author | Narayan Kamath <narayan@google.com> | 2015-03-30 17:10:31 +0100 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2015-03-30 19:03:29 +0100 |
| commit | de7c1fb9684c2558743e88fbf74a61f5ed6b47b5 (patch) | |
| tree | d00708b171a494ddb7d16974fa7fbd8a5be4940f /benchmarks/Android.mk | |
| parent | fc62e635ef4dcdeda9f144c90dd77568be0176fc (diff) | |
| download | libcore-de7c1fb9684c2558743e88fbf74a61f5ed6b47b5.zip libcore-de7c1fb9684c2558743e88fbf74a61f5ed6b47b5.tar.gz libcore-de7c1fb9684c2558743e88fbf74a61f5ed6b47b5.tar.bz2 | |
Add icu4j to core-libart.jar.
The first approach of building icu4j against the SDK and adding that
to the boot classpath won't work out too well. Besides being a bit
of a hack, there's no way to express that relationship for hostdex
builds.
We now compile icu4j sources along with core-libart. This is the most
direct way of expressing this relationship and allows us to include
exactly what we need.
Note that we exclude the locale SPIs, transliterators and charset code
by default.
Change-Id: Idd305e77480bc681ed5b47e740dfec20d3bc7b26
Diffstat (limited to 'benchmarks/Android.mk')
| -rw-r--r-- | benchmarks/Android.mk | 3 |
1 files changed, 1 insertions, 2 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 |