--- a/make/CompileJavaModules.gmk Tue Dec 22 20:47:40 2015 -0800
+++ b/make/CompileJavaModules.gmk Wed Dec 23 13:12:12 2015 +0300
@@ -367,10 +367,6 @@
################################################################################
-jdk.hotspot.agent_SRC += \
- $(SUPPORT_OUTPUTDIR)/gensrc/jdk.hotspot.agent \
- $(HOTSPOT_TOPDIR)/agent/src/share/classes \
- #
jdk.hotspot.agent_ADD_JAVAC_FLAGS := $(DISABLE_WARNINGS),-overrides
jdk.hotspot.agent_COPY := .png sa.js .properties
@@ -381,9 +377,9 @@
# These can't be handled by COPY to SetupJavaCompilation since they chop off
# one directory level.
$(eval $(call SetupCopyFiles, COPY_SA_IMAGES, \
- SRC := $(HOTSPOT_TOPDIR)/agent/src/share/classes/images, \
+ SRC := $(HOTSPOT_TOPDIR)/src/jdk.hotspot.agent/share/classes/images, \
DEST := $(JDK_OUTPUTDIR)/modules/$(MODULE), \
- FILES := $(wildcard $(HOTSPOT_TOPDIR)/agent/src/share/classes/images/*/*/*.gif), \
+ FILES := $(wildcard $(HOTSPOT_TOPDIR)/src/jdk.hotspot.agent/share/classes/images/*/*/*.gif), \
))
jdk.hotspot.agent: $(COPY_SA_IMAGES)
endif