diff options
| author | Kenny Root <kroot@google.com> | 2013-04-30 04:02:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-04-30 04:02:01 +0000 |
| commit | 1f6e789b7ee9698ab8c528a393c28cce500ace04 (patch) | |
| tree | f94cdb76c346cb3db48f41945b4e3f5c8ba2dc5e /keystore/tests | |
| parent | 28d91bdbde63ba1afe3bb67c5466527ec7184217 (diff) | |
| parent | 12e752225aa96888358294be0d725d499a1c9f03 (diff) | |
| download | frameworks_base-1f6e789b7ee9698ab8c528a393c28cce500ace04.zip frameworks_base-1f6e789b7ee9698ab8c528a393c28cce500ace04.tar.gz frameworks_base-1f6e789b7ee9698ab8c528a393c28cce500ace04.tar.bz2 | |
Merge "Track change to JSSE provider"
Diffstat (limited to 'keystore/tests')
| -rw-r--r-- | keystore/tests/Android.mk | 2 | ||||
| -rw-r--r-- | keystore/tests/src/android/security/AndroidKeyStoreTest.java | 2 |
2 files changed, 2 insertions, 2 deletions
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; |