changeset 1340:3c3299ceeddd

Merge
author prr
date Mon, 23 Feb 2015 10:47:09 -0800
parents b082971efc21 a7f523a9c2f5
children 60f674776534
files
diffstat 3 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Feb 17 11:50:02 2015 -0800
+++ b/.hgtags	Mon Feb 23 10:47:09 2015 -0800
@@ -293,3 +293,4 @@
 0064e246d83f6f9fc245c19b6d05041ecaf4b6d4 jdk9-b48
 d91ed1951b948210590ce1394bea5515357246ba jdk9-b49
 d1f37d39ff2421f956a6ddf316cf763807bc3363 jdk9-b50
+6207b4b8731ca75c51b031c47daa813ab92ef558 jdk9-b51
--- a/make/MakeHelpers.gmk	Tue Feb 17 11:50:02 2015 -0800
+++ b/make/MakeHelpers.gmk	Mon Feb 23 10:47:09 2015 -0800
@@ -382,7 +382,7 @@
 	    && $(MAKE) $(MAKE_ARGS) \
 	          -f $$($1_FILE_PREFIX)-$2.gmk \
 	          $$(addprefix -I, $$(wildcard $$(addprefix $3/, $(MAKE_MAKEDIR_LIST)) \
-	          $$(addsuffix /$3, $$(addprefix $3/, $(MAKE_MAKEDIR_LIST))))) \
+	          $$(addsuffix /$$($1_MAKE_SUBDIR), $$(addprefix $3/, $(MAKE_MAKEDIR_LIST))))) \
 	          MODULE=$2)
         endif
 
--- a/make/common/CORE_PKGS.gmk	Tue Feb 17 11:50:02 2015 -0800
+++ b/make/common/CORE_PKGS.gmk	Mon Feb 23 10:47:09 2015 -0800
@@ -103,6 +103,7 @@
     java.lang.reflect \
     java.math \
     java.net \
+    java.net.spi \
     java.nio \
     java.nio.channels \
     java.nio.channels.spi \