diff options
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java | 3 | ||||
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java | 3 |
2 files changed, 5 insertions, 1 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(); } } diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java index e3971f489c..7c4c8f2f70 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java @@ -4066,7 +4066,8 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { "--checkHashMismatch", "IGNORE", "--explicitFilters", - "R\\.class,R\\$.*\\.class,/BR\\.class$,/databinding/[^/]+Binding\\.class$", + "R\\.class,R\\$.*\\.class,/BR\\.class$,/databinding/[^/]+Binding\\.class$," + + "com/google/protobuf/BlazeGeneratedExtensionRegistryLiteLoader\\.class", "--outputMode", "DONT_CARE"); } |