changeset 1258:693b9e6b7e8b

Merge
author erikj
date Mon, 27 Oct 2014 11:16:10 +0100
parents 7384cb07eafd 151654ca7b0a
children 1275a5bc4a7d
files make/MakeHelpers.gmk modules.xml
diffstat 3 files changed, 2 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Oct 23 11:30:13 2014 +0100
+++ b/.hgtags	Mon Oct 27 11:16:10 2014 +0100
@@ -278,3 +278,4 @@
 e4ba01b726e263953ae129be37c94de6ed145b1d jdk9-b33
 087b23f35631e68e950496a36fce8ccca612966a jdk9-b34
 c173ba994245380fb11ef077d1e59823386840eb jdk9-b35
+201d4e235d597a25a2d3ee1404394789ba386119 jdk9-b36
--- a/make/MakeHelpers.gmk	Thu Oct 23 11:30:13 2014 +0100
+++ b/make/MakeHelpers.gmk	Mon Oct 27 11:16:10 2014 +0100
@@ -377,7 +377,7 @@
         else
 	  +($(CD) $$(dir $$(firstword $$(wildcard $$(patsubst %, \
 	          $3/%/$$($1_MAKE_SUBDIR)/$$($1_FILE_PREFIX)-$2.gmk, $(MAKE_MAKEDIR_LIST))))) \
-	      && $(MAKE) $(MAKE_ARGS) \
+	    && $(MAKE) $(MAKE_ARGS) \
 	          -f $$($1_FILE_PREFIX)-$2.gmk \
 	          $$(addprefix -I, $$(wildcard $$(addprefix $3/, $(MAKE_MAKEDIR_LIST)) \
 	          $$(addsuffix /$3, $$(addprefix $3/, $(MAKE_MAKEDIR_LIST))))) \
--- a/modules.xml	Thu Oct 23 11:30:13 2014 +0100
+++ b/modules.xml	Mon Oct 27 11:16:10 2014 +0100
@@ -1495,16 +1495,6 @@
     </export>
   </module>
   <module>
-    <name>jdk.compact3</name>
-    <depend re-exports="true">java.compact3</depend>
-    <depend re-exports="true">java.smartcardio</depend>
-    <depend re-exports="true">jdk.httpserver</depend>
-    <depend re-exports="true">jdk.naming.dns</depend>
-    <depend re-exports="true">jdk.naming.rmi</depend>
-    <depend re-exports="true">jdk.sctp</depend>
-    <depend re-exports="true">jdk.security.auth</depend>
-  </module>
-  <module>
     <name>jdk.compiler</name>
     <depend>java.base</depend>
     <depend re-exports="true">java.compiler</depend>
@@ -1739,7 +1729,6 @@
     <depend>java.base</depend>
     <depend>java.desktop</depend>
     <depend>java.se</depend>
-    <depend>jdk.compact3</depend>
   </module>
   <module>
     <name>jdk.scripting.nashorn</name>