From 0cb8590de83b9250eee198a3f82078aad74f42b5 Mon Sep 17 00:00:00 2001
From: corysmith <corysmith@google.com>
Date: Fri, 3 Aug 2018 15:20:44 -0700
Subject: Reduce and centralize databinding context instances. Due to some of
 the vagaries of skylark and multiple entry points, the databinding context is
 currently updated by the parse action.

RELNOTES: None
PiperOrigin-RevId: 207333111
---
 .../devtools/build/lib/rules/android/MergedAndroidResources.java    | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'src/main/java/com/google/devtools/build/lib/rules/android/MergedAndroidResources.java')

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/MergedAndroidResources.java b/src/main/java/com/google/devtools/build/lib/rules/android/MergedAndroidResources.java
index ce3bc207e5..f139a2b457 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/MergedAndroidResources.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/MergedAndroidResources.java
@@ -40,7 +40,6 @@ public class MergedAndroidResources extends ParsedAndroidResources {
       AndroidDataContext dataContext,
       ParsedAndroidResources parsed,
       ResourceDependencies resourceDeps,
-      boolean enableDataBinding,
       AndroidAaptVersion aaptVersion)
       throws InterruptedException {
 
@@ -60,10 +59,7 @@ public class MergedAndroidResources extends ParsedAndroidResources {
             .setThrowOnResourceConflict(androidConfiguration.throwOnResourceConflict())
             .setUseCompiledMerge(useCompiledMerge);
 
-    if (enableDataBinding) {
-      builder.setDataBindingInfoZip(
-          DataBinding.getLayoutInfoFile(dataContext.getActionConstructionContext()));
-    }
+    parsed.asDataBindingContext().supplyLayoutInfo(builder::setDataBindingInfoZip);
 
     return builder
         .setManifestOut(
-- 
cgit v1.2.3