Automated rollback of commit
*** Reason for rollback ***
b/168485144
@@ -87,12 +87,12 @@ public class JavaProtoAspect extends NativeAspectClass implements ConfiguredAspe
this.javaToolchainAttribute = JavaSemantics.javaToolchainAttribute(env);
}
- protected ConfiguredAspect createWithProtocOpts(
+ @Override
+ public ConfiguredAspect create(
ConfiguredTargetAndData ctadBase,
RuleContext ruleContext,
AspectParameters parameters,
- String toolsRepository,
- Iterable<String> additionalProtocOpts)
+ String toolsRepository)
throws InterruptedException, ActionConflictException {
ConfiguredAspect.Builder aspect = new ConfiguredAspect.Builder(ruleContext);
@@ -104,22 +104,11 @@ public class JavaProtoAspect extends NativeAspectClass implements ConfiguredAspe
JavaProtoAspectCommon aspectCommon =
JavaProtoAspectCommon.getSpeedInstance(ruleContext, javaSemantics, rpcSupport);
- Impl impl = new Impl(ruleContext, protoInfo, aspectCommon, rpcSupport, additionalProtocOpts);
+ Impl impl = new Impl(ruleContext, protoInfo, aspectCommon, rpcSupport);
impl.addProviders(aspect);
return aspect.build();
}
- @Override
- public ConfiguredAspect create(
- ConfiguredTargetAndData ctadBase,
- RuleContext ruleContext,
- AspectParameters parameters,
- String toolsRepository)
- throws InterruptedException, ActionConflictException {
- return createWithProtocOpts(
- ctadBase, ruleContext, parameters, toolsRepository, ImmutableList.of());
- }
-
@Override
public AspectDefinition getDefinition(AspectParameters aspectParameters) {
AspectDefinition.Builder result =
@@ -174,19 +163,15 @@ public class JavaProtoAspect extends NativeAspectClass implements ConfiguredAspe
private final Iterable<JavaProtoLibraryAspectProvider> javaProtoLibraryAspectProviders;
- private final ImmutableList<String> additionalProtocOpts;
-
Impl(
RuleContext ruleContext,
ProtoInfo protoInfo,
JavaProtoAspectCommon aspectCommon,
- RpcSupport rpcSupport,
- Iterable<String> additionalProtocOpts) {
+ RpcSupport rpcSupport) {
this.ruleContext = ruleContext;
this.protoInfo = protoInfo;
this.rpcSupport = rpcSupport;
this.aspectCommon = aspectCommon;
- this.additionalProtocOpts = ImmutableList.copyOf(additionalProtocOpts);
this.javaProtoLibraryAspectProviders =
ruleContext.getPrerequisites("deps", JavaProtoLibraryAspectProvider.class);
@@ -295,10 +280,7 @@ public class JavaProtoAspect extends NativeAspectClass implements ConfiguredAspe
ImmutableList.Builder<ToolchainInvocation> invocations = ImmutableList.builder();
invocations.add(
new ToolchainInvocation(
- "java",
- aspectCommon.getProtoToolchainProvider(),
- sourceJar.getExecPathString(),
- additionalProtocOpts));
+ "java", aspectCommon.getProtoToolchainProvider(), sourceJar.getExecPathString()));
invocations.addAll(rpcSupport.getToolchainInvocation(ruleContext, sourceJar));
ProtoCompileActionBuilder.registerActions(
ruleContext,
