commit 8578b21b95c427cf500c7c82abfaf10aa11c8943
author ilist <ilist@google.com> Thu Dec 23 05:36:34 2021 -0800
committer Copybara-Service <copybara-worker@google.com> Thu Dec 23 05:38:18 2021 -0800
tree fac609f0558d738d44d8bcee273a74e56d4499ac
parent adc9bcfbe9a8cfafe36ee4cbbaeb0fdfc9e161ff

Change ProtoCompileActionBuilder maybeBuild to maybeRegister and include action registration.

This makes it possible to use Starlarkified create_proto_compile_action call.

PiperOrigin-RevId: 417992348

src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java
index 1d1940d..e1dc968 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java
@@ -59,7 +59,6 @@
   public static final String STRICT_DEPS_FLAG_TEMPLATE =
       "--direct_dependencies_violation_msg=" + ProtoConstants.STRICT_PROTO_DEPS_VIOLATION_MESSAGE;
 
-  private final RuleContext ruleContext;
   private final ProtoInfo protoInfo;
   private final FilesToRunProvider protoCompiler;
   private final String language;
@@ -117,13 +116,11 @@
   }
 
   public ProtoCompileActionBuilder(
-      RuleContext ruleContext,
       ProtoInfo protoInfo,
       FilesToRunProvider protoCompiler,
       String language,
       String langPrefix,
       Iterable<Artifact> outputs) {
-    this.ruleContext = ruleContext;
     this.protoInfo = protoInfo;
     this.protoCompiler = protoCompiler;
     this.language = language;
@@ -160,20 +157,23 @@
     }
   }
 
-  @Nullable
-  public SpawnAction maybeBuild() {
+  public void maybeRegister(RuleContext ruleContext) {
     if (isEmpty(outputs)) {
-      return null;
+      return;
     }
 
     try {
-      return createAction().build(ruleContext);
+      SpawnAction action = createAction(ruleContext).build(ruleContext);
+      if (action != null) {
+        ruleContext.registerAction(action);
+      }
     } catch (MissingPrerequisiteException e) {
-      return null;
+      // Ignore missing proto compiler.
     }
   }
 
-  private SpawnAction.Builder createAction() throws MissingPrerequisiteException {
+  private SpawnAction.Builder createAction(RuleContext ruleContext)
+      throws MissingPrerequisiteException {
     SpawnAction.Builder result =
         new SpawnAction.Builder().addTransitiveInputs(protoInfo.getTransitiveProtoSources());
 
@@ -201,7 +201,7 @@
         .useDefaultShellEnvironment()
         .setExecutable(protoCompiler)
         .addCommandLine(
-            createProtoCompilerCommandLine().build(),
+            createProtoCompilerCommandLine(ruleContext).build(),
             ParamFileInfo.builder(ParameterFileType.UNQUOTED).build())
         .setProgressMessage("Generating %s proto_library %s", language, ruleContext.getLabel())
         .setMnemonic(mnemonic);
@@ -210,8 +210,7 @@
   }
 
   /** Commandline generator for protoc invocations. */
-  @VisibleForTesting
-  CustomCommandLine.Builder createProtoCompilerCommandLine() {
+  private CustomCommandLine.Builder createProtoCompilerCommandLine(RuleContext ruleContext) {
     CustomCommandLine.Builder result = CustomCommandLine.builder();
 
     if (langPlugin != null && langPlugin.getExecutable() != null) {