summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-04-06 16:20:06 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-04-06 16:20:06 +0000
commitaa0a68f9a2084cc21ab4f985bd5e827bea0fde7c (patch)
tree9f253f19766459731e49a94af1308db02b4602e1
parentbd80fc461722f042616babcc3347456621471e87 (diff)
parent21dce03563f22a755e2fa64c54840dd3203a7b95 (diff)
Move more tests to libcore-crypto-tests am: 21dce03563
Change-Id: I23aa1a486738f14e66177535696f95444f07f7e6
-rw-r--r--JavaLibrary.bp4
1 files changed, 4 insertions, 0 deletions
diff --git a/JavaLibrary.bp b/JavaLibrary.bp
index d800ffb5b7..86cd2968b5 100644
--- a/JavaLibrary.bp
+++ b/JavaLibrary.bp
@@ -607,9 +607,11 @@ java_test {
"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",
],
@@ -671,7 +673,9 @@ java_test {
"//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: [