370 |
370 |
371 # Enable unlimited crypto policy |
371 # Enable unlimited crypto policy |
372 UNLIMITED_CRYPTO=@UNLIMITED_CRYPTO@ |
372 UNLIMITED_CRYPTO=@UNLIMITED_CRYPTO@ |
373 |
373 |
374 GCOV_ENABLED=@GCOV_ENABLED@ |
374 GCOV_ENABLED=@GCOV_ENABLED@ |
|
375 JCOV_ENABLED=@JCOV_ENABLED@ |
|
376 JCOV_HOME=@JCOV_HOME@ |
|
377 JCOV_INPUT_JDK=@JCOV_INPUT_JDK@ |
375 |
378 |
376 # AddressSanitizer |
379 # AddressSanitizer |
377 export ASAN_ENABLED:=@ASAN_ENABLED@ |
380 export ASAN_ENABLED:=@ASAN_ENABLED@ |
378 export DEVKIT_LIB_DIR:=@DEVKIT_LIB_DIR@ |
381 export DEVKIT_LIB_DIR:=@DEVKIT_LIB_DIR@ |
379 ifeq ($(ASAN_ENABLED), yes) |
382 ifeq ($(ASAN_ENABLED), yes) |
837 OS_VERSION_MICRO:=@OS_VERSION_MICRO@ |
840 OS_VERSION_MICRO:=@OS_VERSION_MICRO@ |
838 |
841 |
839 # Images directory definitions |
842 # Images directory definitions |
840 JDK_IMAGE_SUBDIR:=jdk |
843 JDK_IMAGE_SUBDIR:=jdk |
841 JRE_IMAGE_SUBDIR:=jre |
844 JRE_IMAGE_SUBDIR:=jre |
|
845 JCOV_IMAGE_SUBDIR := jdk-jcov |
842 |
846 |
843 # Colon left out to be able to override output dir for bootcycle-images |
847 # Colon left out to be able to override output dir for bootcycle-images |
844 JDK_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(JDK_IMAGE_SUBDIR) |
848 JDK_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(JDK_IMAGE_SUBDIR) |
845 JRE_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(JRE_IMAGE_SUBDIR) |
849 JRE_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(JRE_IMAGE_SUBDIR) |
|
850 JCOV_IMAGE_DIR = $(IMAGES_OUTPUTDIR)/$(JCOV_IMAGE_SUBDIR) |
846 |
851 |
847 # Test image, as above |
852 # Test image, as above |
848 TEST_IMAGE_SUBDIR:=test |
853 TEST_IMAGE_SUBDIR:=test |
849 TEST_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(TEST_IMAGE_SUBDIR) |
854 TEST_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(TEST_IMAGE_SUBDIR) |
850 |
855 |
887 JDK_BUNDLE_NAME := jdk-$(BASE_NAME)_bin$(DEBUG_PART).$(JDK_BUNDLE_EXTENSION) |
892 JDK_BUNDLE_NAME := jdk-$(BASE_NAME)_bin$(DEBUG_PART).$(JDK_BUNDLE_EXTENSION) |
888 JDK_SYMBOLS_BUNDLE_NAME := jdk-$(BASE_NAME)_bin$(DEBUG_PART)-symbols.tar.gz |
893 JDK_SYMBOLS_BUNDLE_NAME := jdk-$(BASE_NAME)_bin$(DEBUG_PART)-symbols.tar.gz |
889 TEST_DEMOS_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-tests-demos$(DEBUG_PART).tar.gz |
894 TEST_DEMOS_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-tests-demos$(DEBUG_PART).tar.gz |
890 TEST_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-tests$(DEBUG_PART).tar.gz |
895 TEST_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-tests$(DEBUG_PART).tar.gz |
891 DOCS_BUNDLE_NAME := jdk-$(BASE_NAME)_doc-api-spec$(DEBUG_PART).tar.gz |
896 DOCS_BUNDLE_NAME := jdk-$(BASE_NAME)_doc-api-spec$(DEBUG_PART).tar.gz |
|
897 JCOV_BUNDLE_NAME := jdk-jcov-$(BASE_NAME)_bin$(DEBUG_PART).$(JDK_BUNDLE_EXTENSION) |
892 |
898 |
893 JDK_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JDK_BUNDLE_NAME) |
899 JDK_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JDK_BUNDLE_NAME) |
894 JDK_SYMBOLS_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JDK_SYMBOLS_BUNDLE_NAME) |
900 JDK_SYMBOLS_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JDK_SYMBOLS_BUNDLE_NAME) |
895 TEST_DEMOS_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(TEST_DEMOS_BUNDLE_NAME) |
901 TEST_DEMOS_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(TEST_DEMOS_BUNDLE_NAME) |
896 TEST_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(TEST_BUNDLE_NAME) |
902 TEST_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(TEST_BUNDLE_NAME) |
897 DOCS_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(DOCS_BUNDLE_NAME) |
903 DOCS_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(DOCS_BUNDLE_NAME) |
|
904 JCOV_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JCOV_BUNDLE_NAME) |
898 |
905 |
899 # This macro is called to allow inclusion of closed source counterparts. |
906 # This macro is called to allow inclusion of closed source counterparts. |
900 # Unless overridden in closed sources, it expands to nothing. |
907 # Unless overridden in closed sources, it expands to nothing. |
901 # Usage: This function is called in an open makefile, with the following |
908 # Usage: This function is called in an open makefile, with the following |
902 # argument: |
909 # argument: |