diff options
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java | 4 | ||||
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java | 2 |
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 537b431699..ce41580a31 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 @@ -1076,6 +1076,10 @@ public class AndroidCommon { .setCheckHashMismatch(checkHashMismatch) .addExplicitFilter("R\\.class") .addExplicitFilter("R\\$.*\\.class") + // These files are generated by databinding in both the target and the instrumentation app + // with different contents. We want to keep the one from the target app. + .addExplicitFilter("/BR\\.class$") + .addExplicitFilter("/databinding/[^/]+Binding\\.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 0d67beb862..2e88c80e13 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 @@ -4104,7 +4104,7 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { "--checkHashMismatch", "IGNORE", "--explicitFilters", - "R\\.class,R\\$.*\\.class", + "R\\.class,R\\$.*\\.class,/BR\\.class$,/databinding/[^/]+Binding\\.class$", "--outputMode", "DONT_CARE"); } |