--- a/jdk/make/common/Release.gmk Mon Jun 02 10:16:54 2008 -0700
+++ b/jdk/make/common/Release.gmk Tue Jun 03 13:28:16 2008 -0700
@@ -369,6 +369,7 @@
com/sun/jarsigner \
com/sun/mirror \
com/sun/source \
+ com/sun/tools/classfile \
com/sun/tools/doclets \
com/sun/tools/example/debug/expr \
com/sun/tools/example/debug/tty \
@@ -378,6 +379,7 @@
com/sun/tools/javadoc \
com/sun/tools/apt \
com/sun/tools/javah \
+ com/sun/tools/javap \
com/sun/tools/corba \
com/sun/tools/internal/xjc \
com/sun/tools/internal/ws \
@@ -568,6 +570,8 @@
$(ECHO) "sun/tools/java/" >> $@
$(ECHO) "sun/tools/javac/" >> $@
$(ECHO) "sun/tools/javap/" >> $@
+ $(ECHO) "com/sun/tools/classfile/" >> $@
+ $(ECHO) "com/sun/tools/javap/" >> $@
$(ECHO) "sun/tools/jconsole/" >> $@
$(ECHO) "sun/tools/jps/" >> $@
$(ECHO) "sun/tools/jstat/" >> $@
--- a/jdk/make/common/internal/Defs-langtools.gmk Mon Jun 02 10:16:54 2008 -0700
+++ b/jdk/make/common/internal/Defs-langtools.gmk Tue Jun 03 13:28:16 2008 -0700
@@ -31,13 +31,15 @@
javax/tools
IMPORT_TOOLS_PACKAGES += \
+ com/sun/javadoc \
com/sun/mirror \
com/sun/source \
com/sun/tools/apt \
+ com/sun/tools/classfile \
+ com/sun/tools/doclets \
com/sun/tools/javac \
- com/sun/tools/javah \
com/sun/tools/javadoc \
- com/sun/tools/doclets \
- com/sun/javadoc \
+ com/sun/tools/javah \
+ com/sun/tools/javap \
sun/tools/javap