From a96f0f8f2a20d6776fdcaf420fe654c4f9f06ae0 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Thu, 17 Jan 2013 16:23:31 -0800 Subject: Add NIST PKIX tests to core-tests and knownfailures Bug: 8030138 Change-Id: Ib29438238a21e20c4f039660d76ded2b96bed492 --- JavaLibrary.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'JavaLibrary.mk') 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 -- cgit v1.1