aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test/java/com
diff options
context:
space:
mode:
Diffstat (limited to 'src/test/java/com')
-rw-r--r--src/test/java/com/google/devtools/build/lib/rules/android/AndroidResourcesTest.java9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidResourcesTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidResourcesTest.java
index f2169b5f4d..d1f9db8166 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidResourcesTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidResourcesTest.java
@@ -496,7 +496,6 @@ public class AndroidResourcesTest extends ResourceTestBase {
ResourceFilterFactory.empty(),
ImmutableList.of(),
false,
- false,
null,
null,
DataBinding.contextFrom(ruleContext))
@@ -549,6 +548,12 @@ public class AndroidResourcesTest extends ResourceTestBase {
private ParsedAndroidResources makeParsedResources(RuleContext ruleContext)
throws RuleErrorException, InterruptedException {
+ return makeParsedResources(ruleContext, DataBinding.asDisabledDataBindingContext());
+ }
+
+ private ParsedAndroidResources makeParsedResources(
+ RuleContext ruleContext, DataBindingContext dataBindingContext)
+ throws RuleErrorException, InterruptedException {
ImmutableList<Artifact> resources = getResources("values-en/foo.xml", "drawable-hdpi/bar.png");
return new AndroidResources(
resources, AndroidResources.getResourceRoots(ruleContext, resources, "resource_files"))
@@ -556,7 +561,7 @@ public class AndroidResourcesTest extends ResourceTestBase {
AndroidDataContext.forNative(ruleContext),
getManifest(),
AndroidAaptVersion.chooseTargetAaptVersion(ruleContext),
- DataBinding.contextFrom(ruleContext));
+ dataBindingContext);
}
private ProcessedAndroidManifest getManifest() {