Move more tests to libcore-crypto-tests
Moving few more tests from cores-tests to libcore-crypto-tests, so they
become part of Conscrypt MTS.
Test: mts-tradefed mts-consrypt on Q and R
Bug: 150644609
Change-Id: I9ae2e6f14abb519886db4fa0fc0c72039c2f4e51
diff --git a/JavaLibrary.bp b/JavaLibrary.bp
index 425e420..f334613 100644
--- a/JavaLibrary.bp
+++ b/JavaLibrary.bp
@@ -533,9 +533,11 @@
"xml/src/test/java/**/*.java",
],
exclude_srcs: [
+ "harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/*.java",
"luni/src/test/java/libcore/java/util/zip/Zip64Test.java",
"luni/src/test/java/libcore/java/util/zip/Zip64FileTest.java",
"luni/src/test/java/libcore/javax/crypto/**/*.java",
+ "luni/src/test/java/libcore/javax/net/ssl/**/*.java",
"luni/src/test/java/org/apache/harmony/crypto/**/*.java",
],
@@ -597,7 +599,9 @@
"//external/conscrypt/apex/tests",
],
srcs: [
+ "harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/*.java",
"luni/src/test/java/libcore/javax/crypto/**/*.java",
+ "luni/src/test/java/libcore/javax/net/ssl/**/*.java",
"luni/src/test/java/org/apache/harmony/crypto/**/*.java",
],
exclude_srcs: [