From 12e752225aa96888358294be0d725d499a1c9f03 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Tue, 23 Apr 2013 22:34:24 -0700 Subject: Track change to JSSE provider Change-Id: I35e824e47ad758ab6408e91e2ba5dcda053a82f5 --- keystore/tests/Android.mk | 2 +- keystore/tests/src/android/security/AndroidKeyStoreTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'keystore/tests') diff --git a/keystore/tests/Android.mk b/keystore/tests/Android.mk index 61cf640..35388d7 100644 --- a/keystore/tests/Android.mk +++ b/keystore/tests/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_CERTIFICATE := platform -LOCAL_JAVA_LIBRARIES := android.test.runner bouncycastle +LOCAL_JAVA_LIBRARIES := android.test.runner bouncycastle conscrypt # Include all test java files. LOCAL_SRC_FILES := $(call all-java-files-under, src) diff --git a/keystore/tests/src/android/security/AndroidKeyStoreTest.java b/keystore/tests/src/android/security/AndroidKeyStoreTest.java index 05ffe109..135f93f 100644 --- a/keystore/tests/src/android/security/AndroidKeyStoreTest.java +++ b/keystore/tests/src/android/security/AndroidKeyStoreTest.java @@ -18,7 +18,7 @@ package android.security; import com.android.org.bouncycastle.x509.X509V3CertificateGenerator; -import org.apache.harmony.xnet.provider.jsse.OpenSSLEngine; +import com.android.org.conscrypt.OpenSSLEngine; import android.test.AndroidTestCase; -- cgit v1.1