diff options
| author |  mjhalupka <mjhalupka@google.com> | 2018-01-31 14:04:50 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-01-31 14:06:41 -0800 |
| commit | b9a0baf61732aa9d98522a71a6d98122e7fb76ec (patch) | |
| tree | 4b3496bfd84e95e439194cfe38810b04166ecdab /src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java | |
| parent | 18e333f7c0b0cc8411feda24f07874eb6dd50467 (diff) | |
Change ConfiguredAspectFactory.create signature to take in a
ConfiguredTargetAndTarget instead of a ConfiguredTarget.
This is to assist in deprecating ConfiguredTarget.getTarget().
PiperOrigin-RevId: 184043491
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java index ce11372257..e08f1bdc38 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java @@ -27,7 +27,6 @@ import com.google.common.collect.ImmutableList; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.analysis.ConfiguredAspect; import com.google.devtools.build.lib.analysis.ConfiguredAspectFactory; -import com.google.devtools.build.lib.analysis.ConfiguredTarget; import com.google.devtools.build.lib.analysis.RuleContext; import com.google.devtools.build.lib.analysis.TransitiveInfoCollection; import com.google.devtools.build.lib.analysis.TransitiveInfoProvider; @@ -63,6 +62,7 @@ import com.google.devtools.build.lib.rules.proto.ProtoLangToolchainProvider; import com.google.devtools.build.lib.rules.proto.ProtoSourcesProvider; import com.google.devtools.build.lib.rules.proto.ProtoSupportDataProvider; import com.google.devtools.build.lib.rules.proto.SupportData; +import com.google.devtools.build.lib.skyframe.ConfiguredTargetAndTarget; import javax.annotation.Nullable; /** An Aspect which JavaLiteProtoLibrary injects to build Java Lite protos. */ @@ -96,13 +96,14 @@ public class JavaLiteProtoAspect extends NativeAspectClass implements Configured @Override public ConfiguredAspect create( - ConfiguredTarget base, RuleContext ruleContext, AspectParameters parameters) + ConfiguredTargetAndTarget ctatBase, RuleContext ruleContext, AspectParameters parameters) throws InterruptedException { ConfiguredAspect.Builder aspect = new ConfiguredAspect.Builder(this, parameters, ruleContext); // Get SupportData, which is provided by the proto_library rule we attach to. SupportData supportData = - checkNotNull(base.getProvider(ProtoSupportDataProvider.class)).getSupportData(); + checkNotNull(ctatBase.getConfiguredTarget().getProvider(ProtoSupportDataProvider.class)) + .getSupportData(); Impl impl = new Impl(ruleContext, supportData, javaSemantics); impl.addProviders(aspect); |