hotspot/make/gensrc/GensrcJvmti.gmk

*** 127,136 ****
--- 127,151 ----
          test -f $@
  
  TARGETS += $(JVMTI_OUTPUTDIR)/jvmtiEnvRecommended.cpp
  
  ################################################################################
+ # Disable copy of jvmti.h from hotspot until this has been cleared up. The file
+ # is currently being copied from the jdk repository.
+ # Copy jvmti.h to include dir
+ 
+ # The file is the same regardless of jvm variant. Only let one do the copy.
+ #ifeq ($(JVM_VARIANT), $(firstword $(JVM_VARIANTS)))
+ #  $(eval $(call SetupCopyFiles, COPY_JVMTI_H, \
+ #      DEST := $(SUPPORT_OUTPUTDIR)/modules_include/java.base, \
+ #      FILES := $(JVMTI_OUTPUTDIR)/jvmti.h, \
+ #  ))
+ 
+ #  TARGETS += $(COPY_JVMTI_H)
+ #endif
+ 
+ ################################################################################
  # Create trace files in gensrc/tracefiles
  
  TRACE_OUTPUTDIR := $(JVM_VARIANT_OUTPUTDIR)/gensrc/tracefiles
  TRACE_SRCDIR := $(HOTSPOT_TOPDIR)/src/share/vm/trace