From fa5274de2fa2b799b934965ac7d8681dc7206567 Mon Sep 17 00:00:00 2001 From: ajmichael Date: Fri, 15 Dec 2017 14:56:10 -0800 Subject: 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 --- .../com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/test/java/com/google') 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"); } -- cgit v1.2.3