aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java
index 506bab6e09..be9bbf157a 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java
@@ -980,6 +980,9 @@ public class AndroidCommon {
// with different contents. We want to keep the one from the target app.
.addExplicitFilter("/BR\\.class$")
.addExplicitFilter("/databinding/[^/]+Binding\\.class$")
+ // The BlazeGeneratedExtensionRegistryLiteLoader class is generated by the proto compiler.
+ // We want to remove the one from the test app to prevent the one version violation.
+ .addExplicitFilter("com/google/protobuf/BlazeGeneratedExtensionRegistryLiteLoader\\.class")
.build();
}
}