diff options
author | 2018-08-03 15:20:44 -0700 | |
---|---|---|
committer | 2018-08-03 15:22:40 -0700 | |
commit | 0cb8590de83b9250eee198a3f82078aad74f42b5 (patch) | |
tree | 33a21822d0c6017c9029d03422182b7a08098292 /src/main/java/com/google/devtools/build/lib/rules/android/MergedAndroidResources.java | |
parent | 1225e4ad5dff72b63953639b4c4c4281f8b46ea5 (diff) |
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
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/MergedAndroidResources.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/MergedAndroidResources.java | 6 |
1 files changed, 1 insertions, 5 deletions
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( |