changeset 4722:d96afa0fa487

remove default method weaving from builds of the JDK
author Robert Field <Robert.Field@oracle.com>
date Tue, 10 Jan 2012 17:16:26 -0800
parents 78684ee5be2c
children ec7c2aab5d8b
files make/common/Defs.gmk make/common/Release.gmk
diffstat 2 files changed, 1 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/make/common/Defs.gmk	Tue Jan 10 10:06:53 2012 -0500
+++ b/make/common/Defs.gmk	Tue Jan 10 17:16:26 2012 -0800
@@ -205,24 +205,6 @@
 ZLIB_VERSION = 1.2.3
 
 #
-# Defender weaver
-#
-ifdef ALT_DEFENDER_WEAVER_DIR
-     DEFENDER_WEAVER_DIR=$(ALT_DEFENDER_WEAVER_DIR)
-else
-     DEFENDER_WEAVER_DIR=../../../defender-prototype
-endif
-
-ifeq ($(PLATFORM), windows)
-   # it needs escaping. I don't know why this isn't done in other cases
-   WEAVER_CP_SEP=\$(CLASSPATH_SEPARATOR)
-else
-   WEAVER_CP_SEP=$(CLASSPATH_SEPARATOR)
-endif
-
-DEFENDER_WEAVER_CP=$(DEFENDER_WEAVER_DIR)/distrib/jsr335-agent.jar$(WEAVER_CP_SEP)$(DEFENDER_WEAVER_DIR)/lib/asm-4.0.jar
-
-#
 # Localizations for the different parts of the product beyond English
 #
 
--- a/make/common/Release.gmk	Tue Jan 10 10:06:53 2012 -0500
+++ b/make/common/Release.gmk	Tue Jan 10 17:16:26 2012 -0800
@@ -686,9 +686,8 @@
 $(RT_JAR): $(RT_JAR_FILELIST) $(RT_JAR_MANIFEST_FILE)
 	$(prep-target)
 	$(CD) $(CLASSBINDIR) && \
-		$(BOOT_JAR_CMD) $(CREATE_JAR_OPTS) $(RT_JAR_MANIFEST_FILE) $(ABS_TEMPDIR)/rt-preweave.jar \
+		$(BOOT_JAR_CMD) $(CREATE_JAR_OPTS) $(RT_JAR_MANIFEST_FILE) $@ \
 		    @$(RT_JAR_FILELIST) $(BOOT_JAR_JFLAGS)
-	$(BOOT_JAVA_CMD) -classpath $(DEFENDER_WEAVER_CP) jsr335.agent.batch.Main -v -d $@ $(ABS_TEMPDIR)/rt-preweave.jar
 	@$(CD) $(CLASSBINDIR) && $(java-vm-cleanup)
 
 # Meta-index construction to make core class loaders lazier