# HG changeset patch # User sla # Date 1402919545 -7200 # Node ID bb8868e02e4d10756e30525216150b6009cfe15c # Parent 296ec671ea4a526495ee7933f1a980139bc625e4 8043939: Remove management-agent.jar Reviewed-by: alanb diff -r 296ec671ea4a -r bb8868e02e4d jdk/make/CreateJars.gmk --- a/jdk/make/CreateJars.gmk Mon Jun 16 11:03:54 2014 +0200 +++ b/jdk/make/CreateJars.gmk Mon Jun 16 13:52:25 2014 +0200 @@ -676,15 +676,6 @@ ########################################################################################## -# -# This is an empty jar (only contains manifest) and fits poorly into framework... -# create simple rule instead -# -$(IMAGES_OUTPUTDIR)/lib/management-agent.jar: $(JDK_TOPDIR)/src/share/classes/sun/management/manifest - $(JAR) cfm $@ $< - -########################################################################################## - # This file is imported from hotspot in Import.gmk. Copying it into images/lib so that # all jars can be found in one place when creating images in Images.gmk. It needs to be # done here so that clean targets can be simple and accurate. diff -r 296ec671ea4a -r bb8868e02e4d jdk/make/profile-includes.txt --- a/jdk/make/profile-includes.txt Mon Jun 16 11:03:54 2014 +0200 +++ b/jdk/make/profile-includes.txt Mon Jun 16 13:52:25 2014 +0200 @@ -132,7 +132,6 @@ $(OPENJDK_TARGET_CPU_LEGACY_LIB)/$(LIBRARY_PREFIX)prefs$(SHARED_LIBRARY_SUFFIX) \ $(OPENJDK_TARGET_CPU_LEGACY_LIB)/$(LIBRARY_PREFIX)sctp$(SHARED_LIBRARY_SUFFIX) \ jvm.hprof.txt \ - management-agent.jar \ management/jmxremote.access \ management/jmxremote.password.template \ management/management.properties \ @@ -140,8 +139,7 @@ PROFILE_3_JRE_OTHER_FILES := -PROFILE_3_JRE_JAR_FILES := \ - management-agent.jar +PROFILE_3_JRE_JAR_FILES := FULL_JRE_BIN_FILES := \ diff -r 296ec671ea4a -r bb8868e02e4d jdk/make/src/classes/build/tools/buildmetaindex/BuildMetaIndex.java --- a/jdk/make/src/classes/build/tools/buildmetaindex/BuildMetaIndex.java Mon Jun 16 11:03:54 2014 +0200 +++ b/jdk/make/src/classes/build/tools/buildmetaindex/BuildMetaIndex.java Mon Jun 16 13:52:25 2014 +0200 @@ -53,7 +53,6 @@ com/sun/net/ javax/ com/sun/security/ -# management-agent.jar ! rt.jar org/w3c/ com/sun/image/ diff -r 296ec671ea4a -r bb8868e02e4d jdk/src/share/classes/sun/management/manifest --- a/jdk/src/share/classes/sun/management/manifest Mon Jun 16 11:03:54 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -Premain-Class: sun.management.Agent -Agent-Class: sun.management.Agent -