make/autoconf/spec.gmk.in

*** 366,375 ****
--- 366,378 ----
  
  # Enable unlimited crypto policy
  UNLIMITED_CRYPTO=@UNLIMITED_CRYPTO@
  
  GCOV_ENABLED=@GCOV_ENABLED@
+ JCOV_ENABLED=@JCOV_ENABLED@
+ JCOV_HOME=@JCOV_HOME@
+ JCOV_INPUT_JDK=@JCOV_INPUT_JDK@
  
  # AddressSanitizer
  export ASAN_ENABLED:=@ASAN_ENABLED@
  export DEVKIT_LIB_DIR:=@DEVKIT_LIB_DIR@
  ifeq ($(ASAN_ENABLED), yes)
*** 833,846 ****
--- 836,851 ----
  OS_VERSION_MICRO:=@OS_VERSION_MICRO@
  
  # Images directory definitions
  JDK_IMAGE_SUBDIR:=jdk
  JRE_IMAGE_SUBDIR:=jre
+ JCOV_IMAGE_SUBDIR := jdk-jcov
  
  # Colon left out to be able to override output dir for bootcycle-images
  JDK_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(JDK_IMAGE_SUBDIR)
  JRE_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(JRE_IMAGE_SUBDIR)
+ JCOV_IMAGE_DIR = $(IMAGES_OUTPUTDIR)/$(JCOV_IMAGE_SUBDIR)
  
  # Test image, as above
  TEST_IMAGE_SUBDIR:=test
  TEST_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(TEST_IMAGE_SUBDIR)
  
*** 883,898 ****
--- 888,905 ----
  JDK_BUNDLE_NAME := jdk-$(BASE_NAME)_bin$(DEBUG_PART).$(JDK_BUNDLE_EXTENSION)
  JDK_SYMBOLS_BUNDLE_NAME := jdk-$(BASE_NAME)_bin$(DEBUG_PART)-symbols.tar.gz
  TEST_DEMOS_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-tests-demos$(DEBUG_PART).tar.gz
  TEST_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-tests$(DEBUG_PART).tar.gz
  DOCS_BUNDLE_NAME := jdk-$(BASE_NAME)_doc-api-spec$(DEBUG_PART).tar.gz
+ JCOV_BUNDLE_NAME := jdk-jcov-$(BASE_NAME)_bin$(DEBUG_PART).$(JDK_BUNDLE_EXTENSION)
  
  JDK_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JDK_BUNDLE_NAME)
  JDK_SYMBOLS_BUNDLE :=  $(BUNDLES_OUTPUTDIR)/$(JDK_SYMBOLS_BUNDLE_NAME)
  TEST_DEMOS_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(TEST_DEMOS_BUNDLE_NAME)
  TEST_BUNDLE :=  $(BUNDLES_OUTPUTDIR)/$(TEST_BUNDLE_NAME)
  DOCS_BUNDLE :=  $(BUNDLES_OUTPUTDIR)/$(DOCS_BUNDLE_NAME)
+ JCOV_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JCOV_BUNDLE_NAME)
  
  # This macro is called to allow inclusion of closed source counterparts.
  # Unless overridden in closed sources, it expands to nothing.
  # Usage: This function is called in an open makefile, with the following
  # argument: