diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-13 23:28:16 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-07-13 23:28:16 +0000 |
| commit | c40c0ac060be35d615934e8827377be06dc8a208 (patch) | |
| tree | e67f5a67dd21e9af427a9ac7f650025cd4b43f3d | |
| parent | 4de914023d12e00650d1e16c267419c015f7d7ef (diff) | |
| parent | 2243effd5499a2a5aeefdbca6dcaf6b8497deea9 (diff) | |
| download | platform_test_suite_harness-android11-dev.tar.gz platform_test_suite_harness-android11-dev.tar.bz2 platform_test_suite_harness-android11-dev.zip | |
Merge "Add /prefetto/protos to DupFileTest exclusion" into rvc-devandroid11-dev
| -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"); |