| commit | ad05688de048d948dba9487770b720e2241f9707 | [log] [tgz] |
|---|---|---|
| author | Julien Desprez <jdesprez@google.com> | Fri Jul 10 10:09:36 2020 -0700 |
| committer | Julien Desprez <jdesprez@google.com> | Fri Jul 10 10:10:23 2020 -0700 |
| tree | 3a56a2561a55fa6798b96ee330658f899f9254da | |
| parent | 0f41b1625fd36a34d7e52523c9515799247eb773 [diff] |
Ignore the new tradefed-no-fwk duplicate It will replace tradefed.jar but for compatibility we can't remove it yet. Test: unit tests Bug: 149758913 Change-Id: I3bd5f73cc57af955ee814325a9428949b1d23872
diff --git a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/presubmit/DupFileTest.java b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/presubmit/DupFileTest.java index f50e59d..95ed957 100644 --- a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/presubmit/DupFileTest.java +++ b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/presubmit/DupFileTest.java
@@ -49,7 +49,8 @@ new String[] {"android/", "javax/annotation/", "com/google/protobuf/", "kotlin/"}; // Temporarily exclude some Tradefed jar while we work on unbundling them. - private static final Set<String> IGNORE_JARS = ImmutableSet.of("tradefed-test-framework.jar"); + private static final Set<String> IGNORE_JARS = + ImmutableSet.of("tradefed-no-fwk.jar", "tradefed-test-framework.jar"); /** test if there are duplicate files in different jars. */ @Test