diff options
author | corysmith <corysmith@google.com> | 2018-08-03 15:38:35 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-08-03 15:40:24 -0700 |
commit | 68cbbe96e8b28e8de50228275f7d2d83c2bb137b (patch) | |
tree | 8764c35ced54abaf6ca5f67c417ebea064a9a51d /src/test/java/com/google | |
parent | 0cb8590de83b9250eee198a3f82078aad74f42b5 (diff) |
Moved all external calls to isDataEnabled to DataBindingContext and made it private.
RELNOTES: None
PiperOrigin-RevId: 207335684
Diffstat (limited to 'src/test/java/com/google')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/android/AndroidResourcesTest.java | 9 |
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() { |