Filter out ConscryptJava6Suite.java. (#496)
Including it causes problems in Android CTS because it results in
tests being added twice, which CTS doesn't handle well.
(cherry picked from commit 82a40039eae6da8276f04af32afd4be6549a991b)
Test: cts -m CtsLibcoreTestCases -t com.android.org.conscrypt (verified test count)
Bug: 78550712
Change-Id: I08b67ad71002775d61f5d117c7b91b615fe48253
diff --git a/Android.mk b/Android.mk
index da82f2d..95b1efa 100644
--- a/Android.mk
+++ b/Android.mk
@@ -57,7 +57,7 @@
#
bundled_test_java_files := $(call all-java-files-under,platform/src/test/java)
-bundled_test_java_files += $(filter-out %/ConscryptSuite.java,\
+bundled_test_java_files += $(filter-out %/ConscryptSuite.java %/ConscryptJava6Suite.java,\
$(call all-java-files-under,openjdk-integ-tests/src/test/java))
bundled_test_java_files += $(call all-java-files-under,testing/src/main/java)
bundled_test_java_files := $(foreach j,$(bundled_test_java_files),\
