Introduce the DataBindingContext interface as part of centralizing the data binding processing pipeline.

RELNOTES: None
PiperOrigin-RevId: 207312398

2 files changed, 25 insertions, 7 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 758eb194f1..368303df9d 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
@@ -145,7 +145,10 @@ public class AndroidResourcesTest extends ResourceTestBase {
       throws Exception {
     RuleContext ruleContext = getRuleContext();
     ValidatedAndroidResources unfiltered =
-        new AndroidResources(unfilteredResources, getResourceRoots(unfilteredResources))
+        new AndroidResources(
+                unfilteredResources,
+                getResourceRoots(unfilteredResources),
+                DataBinding.asDisabledDataBindingContext())
             .process(
                 ruleContext,
                 AndroidDataContext.forNative(ruleContext),
@@ -177,7 +180,10 @@ public class AndroidResourcesTest extends ResourceTestBase {
       boolean isDependency)
       throws Exception {
     AndroidResources unfiltered =
-        new AndroidResources(unfilteredResources, getResourceRoots(unfilteredResources));
+        new AndroidResources(
+            unfilteredResources,
+            getResourceRoots(unfilteredResources),
+            DataBinding.asDisabledDataBindingContext());
     assertFilter(unfiltered, filteredResources, isDependency);
   }
 
@@ -517,7 +523,9 @@ public class AndroidResourcesTest extends ResourceTestBase {
     ImmutableList<Artifact> resources = getResources("values-en/foo.xml", "drawable-hdpi/bar.png");
     AndroidResources raw =
         new AndroidResources(
-            resources, AndroidResources.getResourceRoots(ruleContext, resources, "resource_files"));
+            resources,
+            AndroidResources.getResourceRoots(ruleContext, resources, "resource_files"),
+            DataBinding.asDisabledDataBindingContext());
     StampedAndroidManifest manifest = getManifest();
 
     ParsedAndroidResources parsed =
@@ -556,7 +564,11 @@ public class AndroidResourcesTest extends ResourceTestBase {
       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"))
+            resources,
+            AndroidResources.getResourceRoots(ruleContext, resources, "resource_files"),
+            enableDataBinding
+                ? DataBinding.asEnabledDataBindingContextFrom(ruleContext)
+                : DataBinding.asDisabledDataBindingContext())
         .parse(
             AndroidDataContext.forNative(ruleContext),
             getManifest(),
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/ResourceFilterFactoryTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/ResourceFilterFactoryTest.java
index 1793e42b14..f569191128 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/ResourceFilterFactoryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/ResourceFilterFactoryTest.java
@@ -62,7 +62,11 @@ public class ResourceFilterFactoryTest extends ResourceTestBase {
 
     return ResourceContainer.builder()
         .setAndroidResources(
-            AndroidResources.forResources(errorConsumer, resources, "resource_files"))
+            AndroidResources.forResources(
+                errorConsumer,
+                resources,
+                "resource_files",
+                DataBinding.asDisabledDataBindingContext()))
         .setLabel(label)
         .setManifestExported(false)
         .setManifest(manifest)
@@ -358,7 +362,8 @@ public class ResourceFilterFactoryTest extends ResourceTestBase {
         AndroidResources.forResources(
             errorConsumer,
             ImmutableList.of(localResourceToKeep, localResourceToDiscard),
-            "resource_files");
+            "resource_files",
+            DataBinding.asDisabledDataBindingContext());
 
     ResourceDependencies resourceDependencies =
         ResourceDependencies.empty()
@@ -496,7 +501,8 @@ public class ResourceFilterFactoryTest extends ResourceTestBase {
       ResourceFilterFactory resourceFilterFactory, ImmutableList<Artifact> artifacts)
       throws RuleErrorException {
     AndroidResources localResources =
-        AndroidResources.forResources(errorConsumer, artifacts, "resource_files");
+        AndroidResources.forResources(
+            errorConsumer, artifacts, "resource_files", DataBinding.asDisabledDataBindingContext());
 
     ResourceDependencies resourceDeps = ResourceDependencies.empty();