diff options
| author |  ajmichael <ajmichael@google.com> | 2017-12-15 14:56:10 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2017-12-15 14:59:05 -0800 |
| commit | fa5274de2fa2b799b934965ac7d8681dc7206567 (patch) | |
| tree | 5ae304ce8d9188f13843494ce56a63b50241a7b9 | |
| parent | 931d285e6002197af1fda0d910de07148b617c98 (diff) | |
Filter out generated databinding files from instrumentation APK.
Note that this implies that databinding cannot be used on resources in the test apk. However, the resources in the test apk are already very weird - so I don't think this makes them much weirder.
RELNOTES: None
PiperOrigin-RevId: 179243983
| -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"); } |