Remove obsolete AGENT_BUILD field

Author: olpaw

substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java

@@ -71,7 +71,6 @@
 
 import org.graalvm.compiler.options.OptionKey;
 import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
-import org.graalvm.nativeimage.ImageInfo;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.ProcessProperties;
 
@@ -1515,8 +1514,6 @@ protected Path createImageBuilderArgumentFile(List<String> imageBuilderArguments
         }
     }
 
-    private static final boolean AGENT_BUILD = ImageInfo.isSharedLibrary();
-
     protected int buildImage(List<String> javaArgs, LinkedHashSet<Path> cp, LinkedHashSet<Path> mp, ArrayList<String> imageArgs, LinkedHashSet<Path> imagecp,
                     LinkedHashSet<Path> imagemp) {
         List<String> arguments = new ArrayList<>();
@@ -1544,49 +1541,36 @@ protected int buildImage(List<String> javaArgs, LinkedHashSet<Path> cp, LinkedHa
 
         Function<Path, Path> substituteModulePath = useBundle() ? bundleSupport::substituteModulePath : Function.identity();
         List<Path> imageModulePath = imagemp.stream().map(substituteModulePath).collect(Collectors.toList());
-        List<Path> finalImageModulePath;
-        if (AGENT_BUILD) {
-            String unsupportedMsgTail = " is currently not supported in agent build mode";
-            if (!imageModulePath.isEmpty()) {
-                throw showError("Building modules into images" + unsupportedMsgTail);
-            }
-            if (!addModules.isEmpty()) {
-                throw showError("Using --add-modules" + unsupportedMsgTail);
-            }
-            finalImageModulePath = imageModulePath;
-        } else {
-            Map<String, Path> applicationModules = getModulesFromPath(imageModulePath);
+        Map<String, Path> applicationModules = getModulesFromPath(imageModulePath);
 
-            if (!applicationModules.isEmpty()) {
-                // Remove modules that we already have built-in
-                applicationModules.keySet().removeAll(getBuiltInModules());
-                // Remove modules that we get from the builder
-                applicationModules.keySet().removeAll(getModulesFromPath(mp).keySet());
-            }
-            finalImageModulePath = applicationModules.values().stream().toList();
+        if (!applicationModules.isEmpty()) {
+            // Remove modules that we already have built-in
+            applicationModules.keySet().removeAll(getBuiltInModules());
+            // Remove modules that we get from the builder
+            applicationModules.keySet().removeAll(getModulesFromPath(mp).keySet());
+        }
+        List<Path> finalImageModulePath = applicationModules.values().stream().toList();
 
-            if (!addModules.isEmpty()) {
+        if (!addModules.isEmpty()) {
 
-                arguments.add("-D" + ModuleSupport.PROPERTY_IMAGE_EXPLICITLY_ADDED_MODULES + "=" +
-                                String.join(",", addModules));
+            arguments.add("-D" + ModuleSupport.PROPERTY_IMAGE_EXPLICITLY_ADDED_MODULES + "=" +
+                            String.join(",", addModules));
 
-                List<String> addModulesForBuilderVM = new ArrayList<>();
-                for (String moduleNameInAddModules : addModules) {
-                    if (!applicationModules.containsKey(moduleNameInAddModules)) {
-                        /*
-                         * Module names given to native-image --add-modules that are not referring
-                         * to modules that are passed to native-image via -p/--module-path are
-                         * considered to be part of the module-layer that contains the builder
-                         * itself. Those module names need to be passed as --add-modules arguments
-                         * to the builder VM.
-                         */
-                        addModulesForBuilderVM.add(moduleNameInAddModules);
-                    }
+            List<String> addModulesForBuilderVM = new ArrayList<>();
+            for (String moduleNameInAddModules : addModules) {
+                if (!applicationModules.containsKey(moduleNameInAddModules)) {
+                    /*
+                     * Module names given to native-image --add-modules that are not referring to
+                     * modules that are passed to native-image via -p/--module-path are considered
+                     * to be part of the module-layer that contains the builder itself. Those module
+                     * names need to be passed as --add-modules arguments to the builder VM.
+                     */
+                    addModulesForBuilderVM.add(moduleNameInAddModules);
                 }
+            }
 
-                if (!addModulesForBuilderVM.isEmpty()) {
-                    arguments.add(DefaultOptionHandler.addModulesOption + "=" + String.join(",", addModulesForBuilderVM));
-                }
+            if (!addModulesForBuilderVM.isEmpty()) {
+                arguments.add(DefaultOptionHandler.addModulesOption + "=" + String.join(",", addModulesForBuilderVM));
             }
         }