[GR-18965] Fix native-image-agent=build mode for Java 11.

PullRequest: graal/4664
happylynx · Oct 21, 2019 · 0def59c · 0def59c
2 parents 75baacf + 545c3ab
commit 0def59c
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java b/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java
@@ -90,6 +90,7 @@
 public class NativeImage {
 
     private static final String DEFAULT_GENERATOR_CLASS_NAME = "com.oracle.svm.hosted.NativeImageGeneratorRunner";
+    private static final String DEFAULT_GENERATOR_9PLUS_SUFFIX = "$JDK9Plus";
 
     static final boolean IS_AOT = Boolean.getBoolean("com.oracle.graalvm.isaot");
 
@@ -1189,7 +1190,11 @@ public static void build(BuildConfiguration config) {
     }
 
     public static void agentBuild(Path javaHome, Path workDir, List<String> buildArgs) {
-        performBuild(new DefaultBuildConfiguration(DEFAULT_GENERATOR_CLASS_NAME, javaHome, workDir, buildArgs), NativeImage::new);
+        String generatorClassName = DEFAULT_GENERATOR_CLASS_NAME;
+        if (JavaVersionUtil.JAVA_SPEC > 8) {
+            generatorClassName += DEFAULT_GENERATOR_9PLUS_SUFFIX;
+        }
+        performBuild(new DefaultBuildConfiguration(generatorClassName, javaHome, workDir, buildArgs), NativeImage::new);
     }
 
     public static Map<Path, List<String>> extractEmbeddedImageArgs(Path workDir, String[] imageClasspath) {
@@ -1665,7 +1670,7 @@ public static void main(String[] args) {
                 ModuleSupport.exportAndOpenAllPackagesToUnnamed("jdk.internal.vm.compiler", false);
                 ModuleSupport.exportAndOpenAllPackagesToUnnamed("com.oracle.graal.graal_enterprise", true);
             }
-            NativeImage.main(args, DEFAULT_GENERATOR_CLASS_NAME + "$JDK9Plus");
+            NativeImage.main(args, DEFAULT_GENERATOR_CLASS_NAME + DEFAULT_GENERATOR_9PLUS_SUFFIX);
         }
     }
 }