1 files changed, 11 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/ProcessedAndroidData.java b/src/main/java/com/google/devtools/build/lib/rules/android/ProcessedAndroidData.java
index 484d29649d..f69128afd1 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/ProcessedAndroidData.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/ProcessedAndroidData.java
@@ -19,6 +19,7 @@ import com.google.devtools.build.lib.analysis.RuleContext;
 import com.google.devtools.build.lib.packages.RuleClass.ConfiguredTargetFactory.RuleErrorException;
 import com.google.devtools.build.lib.packages.RuleErrorConsumer;
 import com.google.devtools.build.lib.rules.android.AndroidConfiguration.AndroidAaptVersion;
+import com.google.devtools.build.lib.rules.android.DataBinding.DataBindingContext;
 import com.google.devtools.build.lib.rules.java.ProguardHelper;
 import com.google.devtools.build.lib.syntax.Type;
 import java.util.List;
@@ -68,7 +69,8 @@ public class ProcessedAndroidData {
       boolean crunchPng,
       boolean dataBindingEnabled,
       @Nullable Artifact featureOf,
-      @Nullable Artifact featureAfter)
+      @Nullable Artifact featureAfter,
+      DataBindingContext dataBindingContext)
       throws RuleErrorException, InterruptedException {
     if (conditionalKeepRules && aaptVersion != AndroidAaptVersion.AAPT2) {
       throw errorConsumer.throwWithRuleError(
@@ -96,6 +98,7 @@ public class ProcessedAndroidData {
             .setFeatureAfter(featureAfter);
     return buildActionForBinary(
         dataContext,
+        dataBindingContext,
         errorConsumer,
         builder,
         manifest,
@@ -125,6 +128,7 @@ public class ProcessedAndroidData {
 
     return buildActionForBinary(
         dataContext,
+        DataBinding.contextFrom(ruleContext),
         ruleContext,
         builder,
         manifest,
@@ -139,6 +143,7 @@ public class ProcessedAndroidData {
 
   private static ProcessedAndroidData buildActionForBinary(
       AndroidDataContext dataContext,
+      DataBindingContext dataBindingContext,
       RuleErrorConsumer errorConsumer,
       AndroidResourcesProcessorBuilder builder,
       StampedAndroidManifest manifest,
@@ -164,12 +169,13 @@ public class ProcessedAndroidData {
         .setCrunchPng(crunchPng)
         .withResourceDependencies(resourceDeps)
         .withAssetDependencies(assetDeps)
-        .build(dataContext, resources, assets, manifest);
+        .build(dataContext, resources, assets, manifest, dataBindingContext);
   }
 
   /** Processes Android data (assets, resources, and manifest) for android_local_test targets. */
   public static ProcessedAndroidData processLocalTestDataFrom(
       AndroidDataContext dataContext,
+      DataBindingContext dataBindingContext,
       StampedAndroidManifest manifest,
       Map<String, String> manifestValues,
       AndroidAaptVersion aaptVersion,
@@ -191,12 +197,13 @@ public class ProcessedAndroidData {
         .setCrunchPng(false)
         .withResourceDependencies(resourceDeps)
         .withAssetDependencies(assetDeps)
-        .build(dataContext, resources, assets, manifest);
+        .build(dataContext, resources, assets, manifest, dataBindingContext);
   }
 
   /** Processes Android data (assets, resources, and manifest) for android_test targets. */
   public static ProcessedAndroidData processTestDataFrom(
       AndroidDataContext dataContext,
+      DataBindingContext dataBindingContext,
       StampedAndroidManifest manifest,
       String packageUnderTest,
       boolean hasLocalResourceFiles,
@@ -220,7 +227,7 @@ public class ProcessedAndroidData {
             .withResourceDependencies(resourceDeps)
             .withAssetDependencies(assetDeps);
 
-    return builder.build(dataContext, resources, assets, manifest);
+    return builder.build(dataContext, resources, assets, manifest, dataBindingContext);
   }
 
   /**