diff options
author | 2018-01-16 18:43:22 -0800 | |
---|---|---|
committer | 2018-01-16 18:45:26 -0800 | |
commit | e01d0c8f9019b7e0beb406ea3932e7dc84b6f333 (patch) | |
tree | b5fadec851f807df5b1501e278ca21a33b9775fb /src/main/java/com/google | |
parent | 7ac7b63c658509fd335db6f0149da8e2786c488a (diff) |
Filter out generated proto extension registry loader from instrumentation APK.
RELNOTES: None
PiperOrigin-RevId: 182145172
Diffstat (limited to 'src/main/java/com/google')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java | 3 |
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(); } } |