diff options
| author | Elliott Hughes <enh@google.com> | 2010-04-16 14:14:28 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2010-04-16 14:48:27 -0700 |
| commit | 757a7942eed2b0aa457f8517a0259d2ac82c5b18 (patch) | |
| tree | 00f74b34ca4edeac65d9cb38d8291ee249f5a806 /JavaLibrary.mk | |
| parent | b988f4652e9325f77c60c5aa4d71a703a0793ec3 (diff) | |
| download | libcore-757a7942eed2b0aa457f8517a0259d2ac82c5b18.zip libcore-757a7942eed2b0aa457f8517a0259d2ac82c5b18.tar.gz libcore-757a7942eed2b0aa457f8517a0259d2ac82c5b18.tar.bz2 | |
Merge LocaleData and Resources, rename Resources to ICU.
Also move our ICU tests into our little tree of tests.
Bug: 2596471
Change-Id: I73b53d74c26ef9bf670f12cac58b51ba61eefead
Diffstat (limited to 'JavaLibrary.mk')
| -rw-r--r-- | JavaLibrary.mk | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/JavaLibrary.mk b/JavaLibrary.mk index f9468a8..23f866a 100644 --- a/JavaLibrary.mk +++ b/JavaLibrary.mk @@ -149,16 +149,6 @@ LOCAL_MODULE := core-tests-dom include $(BUILD_JAVA_LIBRARY) include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-test-java-files-under,icu) -LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := core core-tests-support -LOCAL_DX_FLAGS := --core-library -LOCAL_MODULE_TAGS := tests -LOCAL_MODULE := core-tests-icu -include $(BUILD_JAVA_LIBRARY) - -include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-test-java-files-under,json) LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) LOCAL_NO_STANDARD_LIBRARIES := true @@ -204,7 +194,6 @@ LOCAL_JAVA_LIBRARIES := \ core-tests-concurrent \ core-tests-crypto \ core-tests-dom \ - core-tests-icu \ core-tests-json \ core-tests-logging \ core-tests-luni-kernel \ |