diff options
| author | Kenny Root <kroot@google.com> | 2013-01-18 00:32:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-01-18 00:32:41 +0000 |
| commit | 547593a3aacbc5496f9646738d5438ea6aeddeef (patch) | |
| tree | c29fc5790c064f94bf09c8de0e604a25848ee6fb /JavaLibrary.mk | |
| parent | 80c639cadafac58f1d4b5ce657635bf8e52a8f43 (diff) | |
| parent | a96f0f8f2a20d6776fdcaf420fe654c4f9f06ae0 (diff) | |
| download | libcore-547593a3aacbc5496f9646738d5438ea6aeddeef.zip libcore-547593a3aacbc5496f9646738d5438ea6aeddeef.tar.gz libcore-547593a3aacbc5496f9646738d5438ea6aeddeef.tar.bz2 | |
Merge "Add NIST PKIX tests to core-tests and knownfailures"
Diffstat (limited to 'JavaLibrary.mk')
| -rw-r--r-- | JavaLibrary.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/JavaLibrary.mk b/JavaLibrary.mk index 8b3ecb0..846cbfd 100644 --- a/JavaLibrary.mk +++ b/JavaLibrary.mk @@ -97,7 +97,7 @@ LOCAL_SRC_FILES := $(call all-test-java-files-under,dalvik dom json luni support LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_JAVA_LIBRARIES := bouncycastle core core-junit -LOCAL_STATIC_JAVA_LIBRARIES := sqlite-jdbc mockwebserver +LOCAL_STATIC_JAVA_LIBRARIES := sqlite-jdbc mockwebserver nist-pkix-tests LOCAL_JAVACFLAGS := $(local_javac_flags) LOCAL_MODULE := core-tests LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/JavaLibrary.mk @@ -152,7 +152,7 @@ ifeq ($(WITH_HOST_DALVIK),true) LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_JAVA_LIBRARIES := bouncycastle-hostdex core-hostdex core-junit-hostdex - LOCAL_STATIC_JAVA_LIBRARIES := sqlite-jdbc-host mockwebserver-hostdex + LOCAL_STATIC_JAVA_LIBRARIES := sqlite-jdbc-host mockwebserver-hostdex nist-pkix-tests-host LOCAL_JAVACFLAGS := $(local_javac_flags) LOCAL_MODULE_TAGS := optional LOCAL_MODULE := core-tests-hostdex |