diff options
| author | Adam Vartanian <flooey@gmail.com> | 2018-05-22 16:07:35 +0100 |
|---|---|---|
| committer | Adam Vartanian <flooey@google.com> | 2018-05-29 16:15:25 +0100 |
| commit | 488471abd7d7879d83e0b2e30ebf309654cb3446 (patch) | |
| tree | 8037a3cb3f85c358855c91cc13fde2c3054db00b | |
| parent | dcaf96015811c06816517f025b650e44039e571b (diff) | |
| download | conscrypt-pie-b4s4-release.tar.gz | |
Filter out ConscryptJava6Suite.java. (#496)android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-dev
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
| -rw-r--r-- | Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -57,7 +57,7 @@ local_javac_flags:=-Xmaxwarns 9999999 # 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),\ |