| commit | 25ffb0d7c672bb0062a6ee44bbcea30de3f5c96b | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Tue Apr 30 04:02:16 2013 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Apr 30 04:02:16 2013 +0000 |
| tree | 9d9972e92738cd52950e70d8a9c957455a36c1e1 | |
| parent | 1a38ba823ab4440c9442fca34b385aa8bf0f648e [diff] | |
| parent | 0a7364054a646f1b45db6d6c755fd1733024af43 [diff] |
Merge "Track change to JSSE provider"
diff --git a/tests/core/ctscore.mk b/tests/core/ctscore.mk index 1e4e017..95f4634 100644 --- a/tests/core/ctscore.mk +++ b/tests/core/ctscore.mk
@@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -LOCAL_JAVA_LIBRARIES := android.test.runner bouncycastle +LOCAL_JAVA_LIBRARIES := android.test.runner bouncycastle conscrypt LOCAL_PROGUARD_ENABLED := disabled LOCAL_DEX_PREOPT := false