diff options
| author | Elliott Hughes <enh@google.com> | 2013-08-19 16:45:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-19 16:45:52 -0700 |
| commit | 97d47c279091a3754d14abda0fcc651080130377 (patch) | |
| tree | 1b712f43aaf5fa0188889f9686f256fe88cdd0be /JavaLibrary.mk | |
| parent | fda3c941c1b5b62670ab10e067816eaede40566d (diff) | |
| parent | b76fb72d22fb0a202ba543856d38899bb4ace8c7 (diff) | |
| download | libcore-97d47c279091a3754d14abda0fcc651080130377.zip libcore-97d47c279091a3754d14abda0fcc651080130377.tar.gz libcore-97d47c279091a3754d14abda0fcc651080130377.tar.bz2 | |
am b76fb72d: Merge "Temporarily don\'t place jsr166 tests in coretests."
* commit 'b76fb72d22fb0a202ba543856d38899bb4ace8c7':
Temporarily don't place jsr166 tests in coretests.
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 b4e9189..5bdfb01 100644 --- a/JavaLibrary.mk +++ b/JavaLibrary.mk @@ -126,7 +126,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 |