# HG changeset patch # User alundblad # Date 1398177910 -7200 # Node ID 314ab00b353ce9ef13f6138a88b999d27fef5442 # Parent cb4a4ee066ba64846c113371b82d9949b1669e6d 8037085: The sjavac exclude option should accept valid directory identifiers Summary: Option handling code rewritten. Exclusion / inclusion patterns changed from package to directories. Reviewed-by: jfranck, erikj, ihse diff -r cb4a4ee066ba -r 314ab00b353c jdk/make/CompileJavaClasses.gmk --- a/jdk/make/CompileJavaClasses.gmk Tue Apr 22 09:09:55 2014 -0400 +++ b/jdk/make/CompileJavaClasses.gmk Tue Apr 22 16:45:10 2014 +0200 @@ -326,7 +326,7 @@ 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