Take JVM args into account when creating AOT file

Fixes: #52935

Author: geoand

core/deployment/src/main/java/io/quarkus/deployment/pkg/builditem/JvmStartupOptimizerArchiveContainerImageBuildItem.java

@@ -1,19 +1,34 @@
 package io.quarkus.deployment.pkg.builditem;
 
+import java.util.List;
+import java.util.Optional;
+
 import io.quarkus.builder.item.SimpleBuildItem;
 
 /**
  * Indicates that a specific container image should be used to generate the AppCDS file
  */
+@SuppressWarnings("OptionalUsedAsFieldOrParameterType")
 public final class JvmStartupOptimizerArchiveContainerImageBuildItem extends SimpleBuildItem {
 
     private final String containerImage;
+    private final Optional<List<String>> additionalJvmArgs;
 
+    @Deprecated(forRemoval = true, since = "3.34")
     public JvmStartupOptimizerArchiveContainerImageBuildItem(String containerImage) {
+        this(containerImage, Optional.empty());
+    }
+
+    public JvmStartupOptimizerArchiveContainerImageBuildItem(String containerImage, Optional<List<String>> additionalJvmArgs) {
         this.containerImage = containerImage;
+        this.additionalJvmArgs = additionalJvmArgs;
     }
 
     public String getContainerImage() {
         return containerImage;
     }
+
+    public Optional<List<String>> getAdditionalJvmArgs() {
+        return additionalJvmArgs;
+    }
 }

core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/JvmStartupOptimizerArchiveBuildStep.java

@@ -169,8 +169,15 @@ public void build(Optional<JvmStartupOptimizerArchiveRequestedBuildItem> request
             archivePath = createAppCDSFromExit(jarResult, outputTarget, javaBinPath, containerImage,
                     isFastJar);
         } else if (archiveType == JvmStartupOptimizerArchiveType.AOT) {
-            archivePath = createAot(jarResult, outputTarget, javaBinPath, containerImage, isFastJar,
-                    packageConfig.jar().aot().additionalRecordingArgs().orElse(List.of()));
+            List<String> additionalJvmArguments = new ArrayList<>();
+            if (packageConfig.jar().aot().additionalRecordingArgs().isPresent()) {
+                additionalJvmArguments.addAll(packageConfig.jar().aot().additionalRecordingArgs().get());
+            }
+            if (jvmStartupOptimizerArchiveContainerImage.isPresent()
+                    && jvmStartupOptimizerArchiveContainerImage.get().getAdditionalJvmArgs().isPresent()) {
+                additionalJvmArguments.addAll(jvmStartupOptimizerArchiveContainerImage.get().getAdditionalJvmArgs().get());
+            }
+            archivePath = createAot(jarResult, outputTarget, javaBinPath, containerImage, isFastJar, additionalJvmArguments);
         } else {
             throw new IllegalStateException("Unsupported archive type: " + archiveType);
         }

extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibProcessor.java

@@ -141,7 +141,8 @@ public void jvmStartupOptimizerArchive(ContainerImageConfig containerImageConfig
         }
 
         producer.produce(
-                new JvmStartupOptimizerArchiveContainerImageBuildItem(determineBaseJvmImage(jibConfig, compiledJavaVersion)));
+                new JvmStartupOptimizerArchiveContainerImageBuildItem(determineBaseJvmImage(jibConfig, compiledJavaVersion),
+                        jibConfig.jvmAdditionalArguments()));
     }
 
     private String determineBaseJvmImage(ContainerImageJibConfig jibConfig, CompiledJavaVersionBuildItem compiledJavaVersion) {