From 1c2d729bb7878f74bb17d4b6a2e9d37a4d373d43 Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <fabio.niephaus@oracle.com>
Date: Fri, 9 Jun 2023 10:32:47 +0200
Subject: [PATCH] Move `jdk_internal_platform` to `defaultBuiltInPkgNatives`.

(cherry picked from commit ec0dd7f3889701b3e330f817997b98e3f5624173)
---
 .../oracle/svm/core/jdk/PlatformNativeLibrarySupport.java  | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/PlatformNativeLibrarySupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/PlatformNativeLibrarySupport.java
index a57eb122e3dd..303475b2fe11 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/PlatformNativeLibrarySupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/PlatformNativeLibrarySupport.java
@@ -68,6 +68,7 @@ public abstract class PlatformNativeLibrarySupport {
                     "jdk_internal_jimage",
                     "jdk_internal_misc",
                     "jdk_internal_org",
+                    "jdk_internal_platform",
                     "jdk_internal_util",
                     "jdk_internal_vm",
                     "jdk_net",
@@ -98,12 +99,6 @@ protected PlatformNativeLibrarySupport() {
         builtInPkgNatives = new ArrayList<>();
         if (Platform.includedIn(InternalPlatform.PLATFORM_JNI.class)) {
             builtInPkgNatives.addAll(Arrays.asList(defaultBuiltInPkgNatives));
-            /*
-             * Support builtin methods for Containers and Metrics internal API which is Linux only
-             */
-            if (Platform.includedIn(Platform.LINUX.class)) {
-                builtInPkgNatives.add("jdk_internal_platform");
-            }
         }
     }