diff options
| author |  Googler <noreply@google.com> | 2018-02-07 16:46:26 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-02-07 16:48:49 -0800 |
| commit | fb7b4ac17fd6e13662515ddf771e36ce18eaae60 (patch) | |
| tree | fec26c0deadc00a4d1b6ea27567afb1bd7074672 /src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java | |
| parent | 154317e1269b1925722754291a8c7181ccd005f6 (diff) | |
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
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.java | 3 |
1 files changed, 0 insertions, 3 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(); } } |