Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8004491: Build breakage on Linux due to 8004188
authoralanb
Wed, 05 Dec 2012 12:20:00 +0000
changeset 14759 3c8434051b3e
parent 14758 d6b75b5d550e
child 14760 d815de0ca6f0
child 14898 26c35ea64ec4
8004491: Build breakage on Linux due to 8004188 Reviewed-by: chegar, erikj
jdk/makefiles/CopyFiles.gmk file | annotate | diff | comparison | revisions 
--- a/jdk/makefiles/CopyFiles.gmk	Tue Dec 04 17:40:41 2012 -0500
+++ b/jdk/makefiles/CopyFiles.gmk	Wed Dec 05 12:20:00 2012 +0000
@@ -356,21 +356,9 @@
 
 ##########################################################################################
 
-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) $@
jdk-sandbox