diff make/jvmci.make @ 22087:ba177df8f5aa

added local SuppressFBWarnings annotation to replace findbugs-SuppressFBWarnings.jar dependency
author Doug Simon <doug.simon@oracle.com>
date Thu, 25 Jun 2015 14:33:53 +0200
parents 4ce725f06a27
children 7b4a47fcc4c0
line wrap: on
line diff
--- a/make/jvmci.make	Thu Jun 25 13:17:08 2015 +0200
+++ b/make/jvmci.make	Thu Jun 25 14:33:53 2015 +0200
@@ -147,7 +147,7 @@
 
 JVMCI_API_JAR = $(TARGET)/jvmci-api.jar
 
-JVMCI_API_DEP_JARS = $(TARGET)/jvmci-service.jar jvmci/findbugs-SuppressFBWarnings.jar
+JVMCI_API_DEP_JARS = $(TARGET)/jvmci-service.jar
 
 EXPORTED_FILES += $(JVMCI_API_JAR)
 
@@ -155,8 +155,6 @@
 
 JVMCI_SERVICE_JAR = $(TARGET)/jvmci-service.jar
 
-JVMCI_SERVICE_DEP_JARS = jvmci/findbugs-SuppressFBWarnings.jar
-
 EXPORTED_FILES += $(JVMCI_SERVICE_JAR)
 
 JVMCI_HOTSPOT_SRC = $(shell find jvmci/jdk.internal.jvmci.hotspotvmconfig/src -type f 2> /dev/null)
@@ -170,7 +168,7 @@
 
 JVMCI_HOTSPOT_JAR = $(TARGET)/jvmci-hotspot.jar
 
-JVMCI_HOTSPOT_DEP_JARS = $(TARGET)/jvmci-api.jar $(TARGET)/jvmci-service.jar jvmci/findbugs-SuppressFBWarnings.jar
+JVMCI_HOTSPOT_DEP_JARS = $(TARGET)/jvmci-api.jar $(TARGET)/jvmci-service.jar
 
 EXPORTED_FILES += $(JVMCI_HOTSPOT_JAR)
 
@@ -192,8 +190,8 @@
 	$(call build_and_jar,$(JDK_INTERNAL_JVMCI_OPTIONS_PROCESSOR_JAR),$(subst  $(space),:,$(JVMCI_API_DEP_JARS)),,$(JVMCI_API_JAR))
 
 
-$(JVMCI_SERVICE_JAR): $(JVMCI_SERVICE_SRC)  $(JVMCI_SERVICE_DEP_JARS)
-	$(call build_and_jar,,$(subst  $(space),:,$(JVMCI_SERVICE_DEP_JARS)),,$(JVMCI_SERVICE_JAR))
+$(JVMCI_SERVICE_JAR): $(JVMCI_SERVICE_SRC)  
+	$(call build_and_jar,,$(subst  $(space),:,),,$(JVMCI_SERVICE_JAR))
 
 
 $(JVMCI_HOTSPOT_JAR): $(JVMCI_HOTSPOT_SRC) $(JDK_INTERNAL_JVMCI_HOTSPOTVMCONFIG_PROCESSOR_JAR) $(JDK_INTERNAL_JVMCI_OPTIONS_PROCESSOR_JAR) $(JDK_INTERNAL_JVMCI_SERVICE_PROCESSOR_JAR) $(JVMCI_HOTSPOT_DEP_JARS)