8304053: Revert os specific stubs for SystemMetrics

Reviewed-by: sgehwolf, andrew
openjdk · Mar 15, 2023 · 89aeae1 · 89aeae1
1 parent ebbd3a8
commit 89aeae1
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 94 deletions.
diff --git a/jdk/make/CompileJavaClasses.gmk b/jdk/make/CompileJavaClasses.gmk
@@ -307,6 +307,10 @@ endif
 LINUX_SRC_DIRS :=
 ifeq ($(OPENJDK_TARGET_OS),linux)
      LINUX_SRC_DIRS += $(JDK_TOPDIR)/src/linux/classes
+
+     # Linux is the only OS with an actual implementation of SystemMetrics.
+     # Exclude the generic null-returning stub from solaris/classes for that reason.
+     EXFILES += $(JDK_TOPDIR)/src/solaris/classes/jdk/internal/platform/SystemMetrics.java
 endif
 
 # The exception handling of swing beaninfo

diff --git a/jdk/src/aix/classes/jdk/internal/platform/SystemMetrics.java b/jdk/src/aix/classes/jdk/internal/platform/SystemMetrics.java
diff --git a/jdk/src/macosx/classes/jdk/internal/platform/SystemMetrics.java b/jdk/src/macosx/classes/jdk/internal/platform/SystemMetrics.java
diff --git a/jdk/src/unix/classes/jdk/internal/platform/SystemMetrics.java b/jdk/src/unix/classes/jdk/internal/platform/SystemMetrics.java