8004491: Build breakage on Linux due to 8004188

Reviewed-by: chegar, erikj

8004491: Build breakage on Linux due to 8004188
Reviewed-by: chegar, erikj
80d662b2 · alanb · 94da439c · 80d662b2
隐藏空白更改
内联并排

Showing with 1 addition and 13 deletion

makefiles/CopyFiles.gmk makefiles/CopyFiles.gmk +1 -13

未找到文件。
--- a/makefiles/CopyFiles.gmk
+++ b/makefiles/CopyFiles.gmk
@@ -356,21 +356,9 @@ COPY_FILES += $(JVMCFG)

 ##########################################################################################

-PROPS_SRC := $(JDK_TOPDIR)/src/share/lib/security/java.security
+PROPS_SRC := $(JDK_TOPDIR)/src/share/lib/security/java.security-$(OPENJDK_TARGET_OS)
 PROPS_DST := $(JDK_OUTPUTDIR)/lib/security/java.security

-ifeq ($(OPENJDK_TARGET_OS), solaris)
-	PROPS_SRC := $(JDK_TOPDIR)/src/share/lib/security/java.security-solaris
-endif
-
-ifeq ($(OPENJDK_TARGET_OS), windows)
-	PROPS_SRC := $(JDK_TOPDIR)/src/share/lib/security/java.security-windows
-endif
-
-ifeq ($(OPENJDK_TARGET_OS), macosx)
-	PROPS_SRC := $(JDK_TOPDIR)/src/share/lib/security/java.security-macosx
-endif
-
 $(PROPS_DST): $(PROPS_SRC)
 	$(MKDIR) -p $(@D)
 	$(RM) $@