diff options
| author |  asteinb <asteinb@google.com> | 2018-05-22 09:42:36 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-05-22 09:44:00 -0700 |
| commit | fd0aec8adae7785ca5aecd21886dacd5d9e5091e (patch) | |
| tree | 0aea9a2c18ab05739a68b6a2b86d0d839d34a172 /src/main/java/com/google/devtools/build/lib/rules/android/MergedAndroidResources.java | |
| parent | a51b436f4290a79f77157b9e1f2f2e7b26283a5c (diff) | |
Pass AndroidDataContext to remaining non-ActionBuilder code
Now that the AndroidDataContext is passed everywhere, we can begin modifying
action builders.
This includes removing Label information from Proguard artifact paths.
getUniqueDirectoryArtifact() already included label earlier in the path, so
this information was redundant anyway.
RELNOTES: none
PiperOrigin-RevId: 197576210
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 | 3 |
1 files changed, 2 insertions, 1 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 cbe830244f..da7ceda7b4 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 @@ -61,7 +61,8 @@ public class MergedAndroidResources extends ParsedAndroidResources { .setUseCompiledMerge(useCompiledMerge); if (enableDataBinding) { - builder.setDataBindingInfoZip(DataBinding.getLayoutInfoFile(dataContext.getRuleContext())); + builder.setDataBindingInfoZip( + DataBinding.getLayoutInfoFile(dataContext.getActionConstructionContext())); } return builder |