make/CompileJavaModules.gmk
changeset 34116 b746e382da18
parent 33723 b09ccef0313a
child 34117 afc734a1cf3b
equal deleted inserted replaced
34115:00b704eed6b5 34116:b746e382da18
   359     $(patsubst %, $(JDK_TOPDIR)/src/jdk.compiler/share/classes/%/*.properties, \
   359     $(patsubst %, $(JDK_TOPDIR)/src/jdk.compiler/share/classes/%/*.properties, \
   360         sun/tools/serialver/resources))
   360         sun/tools/serialver/resources))
   361 
   361 
   362 ################################################################################
   362 ################################################################################
   363 
   363 
       
   364 jdk.hotspot.agent_SRC += \
       
   365     $(SUPPORT_OUTPUTDIR)/gensrc/jdk.hotspot.agent \
       
   366     $(HOTSPOT_TOPDIR)/agent/src/share/classes \
       
   367     #
       
   368 jdk.hotspot.agent_ADD_JAVAC_FLAGS := $(DISABLE_WARNINGS),-overrides
       
   369 jdk.hotspot.agent_COPY := .png sa.js .properties
       
   370 
       
   371 ifeq ($(MODULE), jdk.hotspot.agent)
       
   372   ### Copy gif files
       
   373   # Special handling to copy gif files in images/toolbarButtonGraphics \
       
   374   #   -> classes/toolbarButtonGraphics.
       
   375   # These can't be handled by COPY to SetupJavaCompilation since they chop off
       
   376   # one directory level.
       
   377   $(eval $(call SetupCopyFiles, COPY_SA_IMAGES, \
       
   378       SRC := $(HOTSPOT_TOPDIR)/agent/src/share/classes/images, \
       
   379       DEST := $(JDK_OUTPUTDIR)/modules/$(MODULE), \
       
   380       FILES := $(wildcard $(HOTSPOT_TOPDIR)/agent/src/share/classes/images/*/*/*.gif), \
       
   381   ))
       
   382   jdk.hotspot.agent: $(COPY_SA_IMAGES)
       
   383 endif
       
   384 
       
   385 ################################################################################
       
   386 
   364 jdk.internal.le_COPY := .properties
   387 jdk.internal.le_COPY := .properties
   365 
   388 
   366 ################################################################################
   389 ################################################################################
   367 
   390 
   368 jdk.jcmd_COPY := _options
   391 jdk.jcmd_COPY := _options
   533   # When crypto classes are prebuilt, need to look for classes already in
   556   # When crypto classes are prebuilt, need to look for classes already in
   534   # output dir.
   557   # output dir.
   535   ifneq ($(BUILD_CRYPTO), true)
   558   ifneq ($(BUILD_CRYPTO), true)
   536     $1_CLASSPATH += $(JDK_OUTPUTDIR)/modules/$1
   559     $1_CLASSPATH += $(JDK_OUTPUTDIR)/modules/$1
   537   endif
   560   endif
   538   ifeq ($1, jdk.hotspot.agent)
       
   539     ## The source of this module is compiled elsewhere, hotspot, and imported.
       
   540     ## Service types are required in the classpath when compiing module-info
       
   541     $1_CLASSPATH := $$($1_CLASSPATH) $$(addprefix $(JDK_OUTPUTDIR)/modules/,jdk.hotspot.agent)
       
   542   endif
       
   543   $1_JAVAC_FLAGS := -bootclasspath $(EMPTY_DIR) -extdirs $(EMPTY_DIR) -endorseddirs $(EMPTY_DIR) $$($1_ADD_JAVAC_FLAGS)
   561   $1_JAVAC_FLAGS := -bootclasspath $(EMPTY_DIR) -extdirs $(EMPTY_DIR) -endorseddirs $(EMPTY_DIR) $$($1_ADD_JAVAC_FLAGS)
   544 
   562 
   545   $$(eval $$(call SetupJavaCompilation,$1, \
   563   $$(eval $$(call SetupJavaCompilation,$1, \
   546       SETUP := $$(if $$($1_SETUP), $$($1_SETUP), GENERATE_JDKBYTECODE), \
   564       SETUP := $$(if $$($1_SETUP), $$($1_SETUP), GENERATE_JDKBYTECODE), \
   547       SRC := $$(if $$($1_SRC), $$($1_SRC), $$(wildcard $$(call ALL_SRC_DIRS,$1))), \
   565       SRC := $$(if $$($1_SRC), $$($1_SRC), $$(wildcard $$(call ALL_SRC_DIRS,$1))), \