From 37b3eda591979af3236eb0fb21b92f057a82b3b7 Mon Sep 17 00:00:00 2001
From: Nate Stedman <natesm@meta.com>
Date: Thu, 25 Jan 2024 07:43:57 -0800
Subject: [PATCH] Encode a pluginProperties for each processor

Reviewed By: IanChilds

Differential Revision: D53010672

fbshipit-source-id: 63254c90ec7f2691076a8af43b8004812647a164
---
 prelude/jvm/cd_jar_creator_util.bzl | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/prelude/jvm/cd_jar_creator_util.bzl b/prelude/jvm/cd_jar_creator_util.bzl
index 18966fb3..30db9ddc 100644
--- a/prelude/jvm/cd_jar_creator_util.bzl
+++ b/prelude/jvm/cd_jar_creator_util.bzl
@@ -250,22 +250,27 @@ def encode_ap_params(annotation_processor_properties: AnnotationProcessorPropert
     return encoded_ap_params
 
 def encode_plugin_params(plugin_params: [PluginParams, None]) -> [struct, None]:
-    # TODO(cjhopman): We should change plugins to not be merged together just like APs.
     encoded_plugin_params = None
     if plugin_params:
         encoded_plugin_params = struct(
             parameters = [],
-            pluginProperties = [struct(
-                canReuseClassLoader = False,
-                doesNotAffectAbi = False,
-                supportsAbiGenerationFromSource = False,
-                processorNames = plugin_params.processors,
-                classpath = plugin_params.deps.project_as_json("javacd_json") if plugin_params.deps else [],
-                pathParams = {},
-            )],
+            pluginProperties = [
+                encode_plugin_properties(processor, plugin_params)
+                for processor in plugin_params.processors
+            ],
         )
     return encoded_plugin_params
 
+def encode_plugin_properties(processor: str, plugin_params: PluginParams) -> struct:
+    return struct(
+        canReuseClassLoader = False,
+        doesNotAffectAbi = False,
+        supportsAbiGenerationFromSource = False,
+        processorNames = [processor],
+        classpath = plugin_params.deps.project_as_json("javacd_json") if plugin_params.deps else [],
+        pathParams = {},
+    )
+
 def encode_base_jar_command(
         javac_tool: [str, RunInfo, Artifact, None],
         target_type: TargetType,