Skip to content

Commit ead4495

Browse files
comiuscopybara-github
authored andcommitted
Use JavaPluginInfo provider from Android databinding annotation processor.
The annotation processor is a java_plugin, which will stop returning JavaInfo and return only JavaPluginInfo. PiperOrigin-RevId: 389691475
1 parent 14e4a78 commit ead4495

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/main/java/com/google/devtools/build/lib/rules/android/databinding/DataBindingV1Context.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import com.google.devtools.build.lib.rules.android.AndroidCommon;
2323
import com.google.devtools.build.lib.rules.android.AndroidDataContext;
2424
import com.google.devtools.build.lib.rules.android.AndroidResources;
25-
import com.google.devtools.build.lib.rules.java.JavaInfo;
2625
import com.google.devtools.build.lib.rules.java.JavaPluginInfo;
2726
import java.util.List;
2827
import java.util.function.BiConsumer;
@@ -77,9 +76,10 @@ public void supplyAnnotationProcessor(
7776
RuleContext ruleContext, BiConsumer<JavaPluginInfo, Iterable<Artifact>> consumer) {
7877

7978
JavaPluginInfo javaPluginInfo =
80-
JavaInfo.getJavaInfo(
81-
ruleContext.getPrerequisite(DataBinding.DATABINDING_ANNOTATION_PROCESSOR_ATTR))
82-
.getJavaPluginInfo();
79+
(JavaPluginInfo)
80+
ruleContext
81+
.getPrerequisite(DataBinding.DATABINDING_ANNOTATION_PROCESSOR_ATTR)
82+
.get(JavaPluginInfo.PROVIDER.getKey());
8383

8484
ImmutableList<Artifact> annotationProcessorOutputs =
8585
DataBinding.getMetadataOutputs(ruleContext, useUpdatedArgs, metadataOutputSuffixes);

src/main/java/com/google/devtools/build/lib/rules/android/databinding/DataBindingV2Context.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import com.google.devtools.build.lib.rules.android.AndroidDataBindingProcessorBuilder;
3737
import com.google.devtools.build.lib.rules.android.AndroidDataContext;
3838
import com.google.devtools.build.lib.rules.android.AndroidResources;
39-
import com.google.devtools.build.lib.rules.java.JavaInfo;
4039
import com.google.devtools.build.lib.rules.java.JavaPluginInfo;
4140
import com.google.devtools.build.lib.starlarkbuildapi.android.DataBindingV2ProviderApi;
4241
import com.google.devtools.build.lib.starlarkbuildapi.android.DataBindingV2ProviderApi.LabelJavaPackagePair;
@@ -139,9 +138,10 @@ public void supplyAnnotationProcessor(
139138
RuleContext ruleContext, BiConsumer<JavaPluginInfo, Iterable<Artifact>> consumer) {
140139

141140
JavaPluginInfo javaPluginInfo =
142-
JavaInfo.getJavaInfo(
143-
ruleContext.getPrerequisite(DataBinding.DATABINDING_ANNOTATION_PROCESSOR_ATTR))
144-
.getJavaPluginInfo();
141+
(JavaPluginInfo)
142+
ruleContext
143+
.getPrerequisite(DataBinding.DATABINDING_ANNOTATION_PROCESSOR_ATTR)
144+
.get(JavaPluginInfo.PROVIDER.getKey());
145145

146146
ImmutableList<Artifact> annotationProcessorOutputs =
147147
DataBinding.getMetadataOutputs(ruleContext, useUpdatedArgs, metadataOutputSuffixes);

0 commit comments

Comments
 (0)