8037085: The sjavac exclude option should accept valid directory identifiers
authoralundblad
Tue, 22 Apr 2014 16:45:10 +0200
changeset 24040 314ab00b353c
parent 24039 cb4a4ee066ba
child 24041 2bb2c08c958b
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
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