Automated rollback of commit e01d0c8f9019b7e0beb406ea3932e7dc84b6f333.

*** Reason for rollback ***

Has no effect, since one version violation does not use _deploy.jar/_filtered.jar.

*** Original change description ***

Filter out generated proto extension registry loader from instrumentation APK.

RELNOTES: None
PiperOrigin-RevId: 184918011

2 files changed, 1 insertions, 5 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 ab914bcea7..2fbbe6db46 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
@@ -986,9 +986,6 @@ 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 2037468252..ccf94bfbf8 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
@@ -4138,8 +4138,7 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase {
             "--checkHashMismatch",
             "IGNORE",
             "--explicitFilters",
-            "R\\.class,R\\$.*\\.class,/BR\\.class$,/databinding/[^/]+Binding\\.class$,"
-                + "com/google/protobuf/BlazeGeneratedExtensionRegistryLiteLoader\\.class",
+            "R\\.class,R\\$.*\\.class,/BR\\.class$,/databinding/[^/]+Binding\\.class$",
             "--outputMode",
             "DONT_CARE");
   }