commit fc409e28503b5de3fa26af91b70f9290f42db206
author android-build-team Robot <android-build-team-robot@google.com> Thu May 31 07:24:13 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu May 31 07:24:13 2018 +0000
tree 8037a3cb3f85c358855c91cc13fde2c3054db00b
parent af1260e8f17e679a5c5eafec319e872176d4a03d
parent 488471abd7d7879d83e0b2e30ebf309654cb3446

Snap for 4813226 from 488471abd7d7879d83e0b2e30ebf309654cb3446 to pi-release

Change-Id: I60c13d7e23a284d252aa3b288a55fd0fa37b6b12

Android.mk

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),\