diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-07-14 01:30:41 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-14 01:30:41 +0000 |
| commit | f443bfbdad0fb7e11750a54ce3a1cff5db2c2a6a (patch) | |
| tree | e67f5a67dd21e9af427a9ac7f650025cd4b43f3d | |
| parent | 052f5f74acfc27db6ca8e7cc3902951ba41bf7aa (diff) | |
| parent | 6c0f4a91ac7eab11a4736b02c079e8138f970a38 (diff) | |
| download | platform_test_suite_harness-android11-gsi.tar.gz platform_test_suite_harness-android11-gsi.tar.bz2 platform_test_suite_harness-android11-gsi.zip | |
Snap for 6676900 from c40c0ac060be35d615934e8827377be06dc8a208 to rvc-release am: 6c0f4a91acandroid11-gsi
Original change: https://googleplex-android-review.googlesource.com/c/platform/test/suite_harness/+/12138206
Change-Id: Iad17e998b9d2c6b8e825435e4f2a25a4f4cf5d62
| -rw-r--r-- | common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/presubmit/DupFileTest.java | 9 |
1 files changed, 7 insertions, 2 deletions
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 f50e59d7..ce8d5268 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 @@ -46,8 +46,13 @@ public class DupFileTest { // We ignore directories part of the common java and google packages. private static final String[] IGNORE_DIRS = - new String[] {"android/", "javax/annotation/", "com/google/protobuf/", "kotlin/"}; - + new String[] { + "android/", + "javax/annotation/", + "com/google/protobuf/", + "kotlin/", + "perfetto/protos/" + }; // Temporarily exclude some Tradefed jar while we work on unbundling them. private static final Set<String> IGNORE_JARS = ImmutableSet.of("tradefed-test-framework.jar"); |