From ebe813fbb013024bd08b4792ab66a2cf1de1bf97 Mon Sep 17 00:00:00 2001
From: Andreas Lundblad <alundblad@openjdk.org>
Date: Tue, 22 Apr 2014 16:45:10 +0200
Subject: [PATCH] 8037085: The sjavac exclude option should accept valid
 directory identifiers

Option handling code rewritten. Exclusion / inclusion patterns changed from package to directories.

Reviewed-by: jfranck, erikj, ihse
---
 jdk/make/CompileJavaClasses.gmk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jdk/make/CompileJavaClasses.gmk b/jdk/make/CompileJavaClasses.gmk
index ec003f58c20..aed9bec516c 100644
--- a/jdk/make/CompileJavaClasses.gmk
+++ b/jdk/make/CompileJavaClasses.gmk
@@ -326,7 +326,7 @@ JDK_USER_DEFINED_FILTER := $(strip $(subst $(COMMA),$(SPACE), $(JDK_FILTER)))
 ifeq ($(ENABLE_SJAVAC),yes)
   # With sjavac enabled, excluded sources are not even considered for linking. 
   # Explicitly add the security sources to sourcepath for linking.
-  BUILD_JDK_SOURCEPATH:=$(patsubst %,-i$(SPACE)%.*,$(subst /,.,$(SECURITY_PKGS))) \
+  BUILD_JDK_SOURCEPATH:=$(patsubst %,-i$(SPACE)%/*,$(SECURITY_PKGS)) \
       -sourcepath $(JDK_TOPDIR)/src/share/classes
 endif