diff options
| author | Elliott Hughes <enh@google.com> | 2013-08-16 16:35:40 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-16 16:35:40 -0700 |
| commit | db724ad3271d3352afa3d80d8427ff685497362e (patch) | |
| tree | 6f81cad31336bd7bdc1920dba6a165008af0fbf3 /JavaLibrary.mk | |
| parent | f7f4ef9667c3c48cb396827d89ebb2286d13fba3 (diff) | |
| parent | 58e672ed9af6e07968d3ee11036916e374877516 (diff) | |
| download | libcore-db724ad3271d3352afa3d80d8427ff685497362e.zip libcore-db724ad3271d3352afa3d80d8427ff685497362e.tar.gz libcore-db724ad3271d3352afa3d80d8427ff685497362e.tar.bz2 | |
am 58e672ed: Merge "Added jsr166 tck tests as part of the libcore testsuite."
* commit '58e672ed9af6e07968d3ee11036916e374877516':
Added jsr166 tck tests as part of the libcore testsuite.
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 5bdfb01..b4e9189 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 luni support xml) +LOCAL_SRC_FILES := $(call all-test-java-files-under,crypto dalvik dom harmony-tests json jsr166-tests 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 |