# HG changeset patch
# User jjg
# Date 1243639646 25200
# Node ID 958dd4d51d1eceb5d5e404bdf62f620bed20c989
# Parent  b3338e271fcb4a44dfc8980446ba5550e8c1f6ad
6838199: remove support for old javap
Reviewed-by: ohair, mcimadamore

diff -r b3338e271fcb -r 958dd4d51d1e jdk/make/common/Release.gmk
--- a/jdk/make/common/Release.gmk	Fri May 29 15:51:43 2009 +0100
+++ b/jdk/make/common/Release.gmk	Fri May 29 16:27:26 2009 -0700
@@ -345,7 +345,6 @@
 	sun/tools/jar		\
 	sun/tools/java		\
 	sun/tools/javac		\
-	sun/tools/javap		\
 	sun/tools/jps		\
 	sun/tools/jstat		\
 	sun/tools/jstatd	\
@@ -570,7 +569,6 @@
 	$(ECHO) "sun/tools/asm/" >> $@
 	$(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/" >> $@
diff -r b3338e271fcb -r 958dd4d51d1e jdk/make/common/internal/Defs-langtools.gmk
--- a/jdk/make/common/internal/Defs-langtools.gmk	Fri May 29 15:51:43 2009 +0100
+++ b/jdk/make/common/internal/Defs-langtools.gmk	Fri May 29 16:27:26 2009 -0700
@@ -40,6 +40,5 @@
       com/sun/tools/javac           \
       com/sun/tools/javadoc         \
       com/sun/tools/javah           \
-      com/sun/tools/javap           \
-      sun/tools/javap
+      com/sun/tools/javap
 
diff -r b3338e271fcb -r 958dd4d51d1e jdk/make/launchers/Makefile
--- a/jdk/make/launchers/Makefile	Fri May 29 15:51:43 2009 +0100
+++ b/jdk/make/launchers/Makefile	Fri May 29 16:27:26 2009 -0700
@@ -66,7 +66,7 @@
 $(call make-launcher, javac, com.sun.tools.javac.Main, , )
 $(call make-launcher, javadoc, com.sun.tools.javadoc.Main, , )
 $(call make-launcher, javah, com.sun.tools.javah.Main, , )
-$(call make-launcher, javap, sun.tools.javap.Main, , )
+$(call make-launcher, javap, com.sun.tools.javap.Main, , )
 $(call make-launcher, jconsole, sun.tools.jconsole.JConsole, \
   -J-Djconsole.showOutputViewer, )
 $(call make-launcher, jdb, com.sun.tools.example.debug.tty.TTY, , )