Tune FromParams.createApplicationBuilder() to work with macosx packages

Author: alexeysemenyukoracle

src/jdk.jpackage/share/classes/jdk/jpackage/internal/FromParams.java

@@ -70,8 +70,14 @@
 final class FromParams {
 
     static ApplicationBuilder createApplicationBuilder(Map<String, ? super Object> params,
-            Function<Map<String, ? super Object>, Launcher> launcherMapper, ApplicationLayout appLayout)
-            throws ConfigException, IOException {
+            Function<Map<String, ? super Object>, Launcher> launcherMapper,
+            ApplicationLayout appLayout) throws ConfigException, IOException {
+        return createApplicationBuilder(params, launcherMapper, appLayout, Optional.of(RuntimeLayout.DEFAULT));
+    }
+
+    static ApplicationBuilder createApplicationBuilder(Map<String, ? super Object> params,
+            Function<Map<String, ? super Object>, Launcher> launcherMapper,
+            ApplicationLayout appLayout, Optional<RuntimeLayout> predefinedRuntimeLayout) throws ConfigException, IOException {
 
         final var appBuilder = new ApplicationBuilder();
 
@@ -85,8 +91,13 @@ static ApplicationBuilder createApplicationBuilder(Map<String, ? super Object> p
 
         final var isRuntimeInstaller = isRuntimeInstaller(params);
 
+        final var predefinedRuntimeImage = PREDEFINED_RUNTIME_IMAGE.findIn(params);
+
+        final var predefinedRuntimeDirectory = predefinedRuntimeLayout.flatMap(
+                layout -> predefinedRuntimeImage.map(layout::resolveAt)).map(RuntimeLayout::runtimeDirectory);
+
         if (isRuntimeInstaller) {
-            appBuilder.appImageLayout(RuntimeLayout.DEFAULT);
+            appBuilder.appImageLayout(predefinedRuntimeLayout.orElseThrow());
         } else {
             appBuilder.appImageLayout(appLayout);
 
@@ -103,8 +114,7 @@ static ApplicationBuilder createApplicationBuilder(Map<String, ? super Object> p
 
                 MODULE_PATH.copyInto(params, runtimeBuilderBuilder::modulePath);
 
-                final var predefinedRuntimeImage = PREDEFINED_RUNTIME_IMAGE.findIn(params);
-                predefinedRuntimeImage.ifPresentOrElse(runtimeBuilderBuilder::forRuntime, () -> {
+                predefinedRuntimeDirectory.ifPresentOrElse(runtimeBuilderBuilder::forRuntime, () -> {
                     final var startupInfos = launchers.asList().stream()
                             .map(Launcher::startupInfo)
                             .map(Optional::orElseThrow).toList();