Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6855953: JDK7 - merger error of deployment changes with b62 -in jdk/make/sun/Makefile
authorherrick
Mon, 29 Jun 2009 17:34:29 -0400
changeset 3118 062b5a1c9d83
parent 3117 3feb81c41231
child 3119 1159db0ff0c5
6855953: JDK7 - merger error of deployment changes with b62 -in jdk/make/sun/Makefile Summary: This problem was discovered testing initial changeset for implementing 6uX Deployment Features into JDK7 Reviewed-by: dgu, billyh
jdk/make/sun/Makefile file | annotate | diff | comparison | revisions 
--- a/jdk/make/sun/Makefile	Mon Jun 29 12:06:42 2009 -0400
+++ b/jdk/make/sun/Makefile	Mon Jun 29 17:34:29 2009 -0400
@@ -59,7 +59,7 @@
   RENDER_SUBDIR = dcpr
 endif
 # nio need to be compiled before awt to have all charsets ready
-SUBDIRS = jar security javazic misc net audio $(RENDER_SUBDIR) image \
+SUBDIRS = jar security javazic misc jkernel net audio $(RENDER_SUBDIR) image \
 	  nio awt splashscreen $(XAWT_SUBDIR) \
           $(HEADLESS_SUBDIR) $(DGA_SUBDIR) \
 	  font jpeg cmm applet rmi beans $(JDBC_SUBDIR) \
jdk-sandbox