diff options
| author | Ian Rogers <irogers@google.com> | 2013-08-19 10:57:22 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2013-08-19 16:40:24 -0700 |
| commit | 3d41b9abc97ffc1f95b63a30f9a2ab72aaef1139 (patch) | |
| tree | 36126c07bce447a20d3d3c099ca1a5d17126fac7 /JavaLibrary.mk | |
| parent | 809a60870c34bc09339eb77d21cad1f0cbb782f3 (diff) | |
| download | libcore-3d41b9abc97ffc1f95b63a30f9a2ab72aaef1139.zip libcore-3d41b9abc97ffc1f95b63a30f9a2ab72aaef1139.tar.gz libcore-3d41b9abc97ffc1f95b63a30f9a2ab72aaef1139.tar.bz2 | |
Temporarily don't place jsr166 tests in coretests.
Build fix. We're over the dex method reference limit.
Removes part of commit 8f0d92bba199d906c70a5e40d7f3516c1a424117.
(cherry-pick of 5f17cb094449b2667f0fca5988da6f5b103161f9.)
Change-Id: If47b84c0baf2621e59ab262a0f9c088d98f5e33f
Diffstat (limited to 'JavaLibrary.mk')
| -rw-r--r-- | JavaLibrary.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/JavaLibrary.mk b/JavaLibrary.mk index e4e9fe6..673c0bf 100644 --- a/JavaLibrary.mk +++ b/JavaLibrary.mk @@ -118,7 +118,7 @@ include $(BUILD_JAVA_LIBRARY) ifeq ($(LIBCORE_SKIP_TESTS),) # Make the core-tests library. include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-test-java-files-under,crypto dalvik dom harmony-tests json jsr166-tests luni support xml) +LOCAL_SRC_FILES := $(call all-test-java-files-under,crypto dalvik dom harmony-tests json luni support xml) LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_JAVA_LIBRARIES := bouncycastle core conscrypt-nojarjar core-junit okhttp |