moved jdk.graal.nativeimage to sdk

Author: dougxc

compiler/mx.compiler/suite.py

@@ -473,17 +473,6 @@
 
     # ------------- libgraal -------------
 
-    # Native Image API extensions for libgraal.
-    "jdk.graal.nativeimage" : {
-      "subDir" : "src",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "sdk:NATIVEIMAGE"
-      ],
-      "checkstyle" : "jdk.graal.compiler",
-      "javaCompliance" : "21+"
-    },
-
     # See jdk.graal.compiler.core.common.LibGraalSupport for the SPI
     # used by core compiler classes to access libgraal specific
     # functionality without requiring the compiler classes to directly
@@ -495,7 +484,7 @@
       "javaCompliance" : "21+",
       "dependencies" : [
         "GRAAL",
-        "GRAAL_NATIVEIMAGE",
+        "sdk:GRAAL_NATIVEIMAGE",
         "sdk:JNIUTILS",
         "sdk:NATIVEBRIDGE"
       ],
@@ -523,7 +512,7 @@
       "workingSets" : "Graal",
       "javaCompliance" : "21+",
       "dependencies" : [
-        "GRAAL_NATIVEIMAGE",
+        "sdk:GRAAL_NATIVEIMAGE",
       ],
       "requiresConcealed" : {
         "java.base" : [
@@ -681,39 +670,13 @@
       },
     },
 
-    "GRAAL_NATIVEIMAGE" : {
-      "subDir" : "src",
-      "dependencies" : [
-        "jdk.graal.nativeimage",
-      ],
-      "distDependencies" : ["sdk:NATIVEIMAGE"],
-      "javadocType": "api",
-      "moduleInfo" : {
-        "name" : "jdk.graal.nativeimage",
-        "requires" : [
-          "transitive org.graalvm.nativeimage",
-        ],
-        "exports" : [
-          "jdk.graal.nativeimage",
-          "jdk.graal.nativeimage.hosted",
-          "jdk.graal.nativeimage.impl to org.graalvm.nativeimage.builder",
-        ],
-        "uses" : [],
-        "opens" : [],
-      },
-      "description" : "Native Image API extensions for libgraal.",
-      "maven": {
-        "tag": ["default", "public"],
-      },
-    },
-
     "LIBGRAAL_LOADER" : {
       "subDir": "src",
       "dependencies" : [
         "jdk.graal.compiler.libgraal.loader"
       ],
       "distDependencies" : [
-        "GRAAL_NATIVEIMAGE",
+        "sdk:GRAAL_NATIVEIMAGE",
         "GRAAL",
       ],
       "maven": False,
@@ -731,7 +694,7 @@
       ],
       "distDependencies": [
         "GRAAL",
-        "GRAAL_NATIVEIMAGE",
+        "sdk:GRAAL_NATIVEIMAGE",
         "sdk:JNIUTILS",
         "sdk:NATIVEIMAGE",
         "sdk:NATIVEBRIDGE"

compiler/src/jdk.graal.nativeimage/src/jdk/graal/nativeimage/LibGraalLoader.java

@@ -158,7 +158,7 @@ def upx(args):
     third_party_license_files=[],
     dependencies=['sdkc'],
     jar_distributions=[],
-    boot_jars=['sdk:NATIVEIMAGE', 'compiler:GRAAL_NATIVEIMAGE'],
+    boot_jars=['sdk:NATIVEIMAGE', 'sdk:GRAAL_NATIVEIMAGE'],
     stability="supported",
 )
 mx_sdk_vm.register_graalvm_component(graalvm_sdk_native_image_component)