1 files changed, 9 insertions, 10 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java
index 58ef404322..54e7683d07 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java
@@ -135,13 +135,6 @@ public abstract class AndroidLibrary implements RuleConfiguredTargetFactory {
     AndroidIdlHelper.maybeAddSupportLibProguardConfigs(ruleContext, proguardConfigsbuilder);
     NestedSet<Artifact> transitiveProguardConfigs = proguardConfigsbuilder.build();
 
-    // JavaCommon and AndroidCommon contain shared helper classes between java_* and android_*
-    // rules respectively.
-    JavaCommon javaCommon =
-        AndroidCommon.createJavaCommonWithAndroidDataBinding(ruleContext, javaSemantics, true);
-    javaSemantics.checkRule(ruleContext, javaCommon);
-    AndroidCommon androidCommon = new AndroidCommon(javaCommon);
-
     AndroidConfiguration androidConfig = AndroidCommon.getAndroidConfig(ruleContext);
 
     // "Resources" here include actual resources (xmls, drawables, etc), assets, and the manifest.
@@ -205,9 +198,7 @@ public abstract class AndroidLibrary implements RuleConfiguredTargetFactory {
                 ruleContext.getImplicitOutputArtifact(
                     AndroidRuleClasses.ANDROID_PROCESSED_MANIFEST),
                 ruleContext.getImplicitOutputArtifact(AndroidRuleClasses.ANDROID_RESOURCES_ZIP),
-                DataBinding.isEnabled(ruleContext)
-                    ? DataBinding.getLayoutInfoFile(ruleContext)
-                    : null);
+                DataBinding.contextFrom(ruleContext));
       }
       if (ruleContext.hasErrors()) {
         return null;
@@ -223,6 +214,14 @@ public abstract class AndroidLibrary implements RuleConfiguredTargetFactory {
               StampedAndroidManifest.createEmpty(ruleContext, /* exported = */ false));
     }
 
+    // JavaCommon and AndroidCommon contain shared helper classes between java_* and android_*
+    // rules respectively.
+    JavaCommon javaCommon =
+        AndroidCommon.createJavaCommonWithAndroidDataBinding(
+            ruleContext, javaSemantics, resourceApk.asDataBindingContext(), /* isLibrary */ true);
+    javaSemantics.checkRule(ruleContext, javaCommon);
+    AndroidCommon androidCommon = new AndroidCommon(javaCommon);
+
     // As android_library makes use of the Java rule compilation pipeline, we collect all
     // Java-related information here to be passed into the JavaSourceInfoProvider later.
     JavaTargetAttributes javaTargetAttributes =