make/gensrc/Gensrc-jdk.vm.ci.gmk

Print this page

        

@@ -34,19 +34,10 @@
 SRC_DIR := $(HOTSPOT_TOPDIR)/src/jdk.vm.ci/share/classes
 
 ################################################################################
 # Compile the annotation processor
 
-$(eval $(call SetupJavaCompilation, BUILD_JVMCI_OPTIONS, \
-    SETUP := GENERATE_OLDBYTECODE, \
-    SRC := $(SRC_DIR)/jdk.vm.ci.options/src \
-        $(SRC_DIR)/jdk.vm.ci.options.processor/src \
-        $(SRC_DIR)/jdk.vm.ci.inittimer/src, \
-    BIN := $(BUILDTOOLS_OUTPUTDIR)/jvmci_options, \
-    JAR := $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.ci.options.jar, \
-))
-
 $(eval $(call SetupJavaCompilation, BUILD_JVMCI_SERVICE, \
     SETUP := GENERATE_OLDBYTECODE, \
     SRC := $(SRC_DIR)/jdk.vm.ci.service/src \
         $(SRC_DIR)/jdk.vm.ci.service.processor/src, \
     BIN := $(BUILDTOOLS_OUTPUTDIR)/jvmci_service, \

@@ -67,15 +58,14 @@
 PROC_SRCS := $(filter %.java, $(call CacheFind, $(PROC_SRC_DIRS)))
 
 ALL_SRC_DIRS := $(wildcard $(SRC_DIR)/*/src)
 SOURCEPATH := $(call PathList, $(ALL_SRC_DIRS))
 PROCESSOR_PATH := $(call PathList, \
-    $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.ci.options.jar \
     $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.ci.service.jar)
 
 $(GENSRC_DIR)/_gensrc_proc_done: $(PROC_SRCS) \
-    $(BUILD_JVMCI_OPTIONS) $(BUILD_JVMCI_SERVICE)
+    $(BUILD_JVMCI_SERVICE)
         $(MKDIR) -p $(@D)
         $(eval $(call ListPathsSafely,PROC_SRCS,$(@D)/_gensrc_proc_files))
         $(JAVA_SMALL) $(NEW_JAVAC) \
             -XDignore.symbol.file \
             -sourcepath $(SOURCEPATH) \

@@ -89,19 +79,10 @@
 
 TARGETS += $(GENSRC_DIR)/_gensrc_proc_done
 
 ################################################################################
 
-$(GENSRC_DIR)/META-INF/services/jdk.vm.ci.options.OptionDescriptors: \
-    $(GENSRC_DIR)/_gensrc_proc_done
-        $(MKDIR) -p $(@D)
-        $(FIND) $(GENSRC_DIR) -name '*_OptionDescriptors.java' | $(SED) 's:.*/jdk\.vm\.ci/\(.*\)\.java:\1:' | $(TR) '/' '.' > $@
-
-TARGETS += $(GENSRC_DIR)/META-INF/services/jdk.vm.ci.options.OptionDescriptors
-
-################################################################################
-
 $(GENSRC_DIR)/_providers_converted: $(GENSRC_DIR)/_gensrc_proc_done
         $(MKDIR) -p $(GENSRC_DIR)/META-INF/services
         ($(CD) $(GENSRC_DIR)/META-INF/jvmci.providers && \
             for i in $$($(LS)); do \
               c=$$($(CAT) $$i | $(TR) -d '\n\r'); \