Bug 448386 - Build error _javagen/org/mozilla/interfaces/nsIMicrosummaryService with xulrunner, r=ted.mielczarek
authorJory A. Pratt <anarchy@gentoo.org>
Fri, 13 Nov 2009 08:45:00 -0800
changeset 35692 1484f0779ccd57df9f00aba55a9331959ec6a7fc
parent 35691 215ca7a9e2ba566194dd8194f41e8b14defd95a9
child 35693 0db0a203473325dc764b6d489cc38d210ca6fdc4
push id10682
push userphilringnalda@gmail.com
push dateMon, 14 Dec 2009 02:11:07 +0000
treeherdermozilla-central@bc0849430750 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs448386
milestone1.9.3a1pre
Bug 448386 - Build error _javagen/org/mozilla/interfaces/nsIMicrosummaryService with xulrunner, r=ted.mielczarek
config/rules.mk
js/src/config/rules.mk
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -1780,17 +1780,17 @@ GARBAGE_DIRS += $(JAVA_GEN_DIR)
 
 # generate .java files into _javagen/[package name dirs]
 _JAVA_GEN_DIR = $(JAVA_GEN_DIR)/$(JAVA_IFACES_PKG_NAME)
 $(_JAVA_GEN_DIR):
 	$(NSINSTALL) -D $@
 
 $(JAVA_GEN_DIR)/.%.java.pp: %.idl $(XPIDL_COMPILE) $(_JAVA_GEN_DIR)
 	$(REPORT_BUILD)
-	$(ELOG) $(XPIDL_COMPILE) -m java -w -I$(srcdir) -I$(IDL_DIR) -o $(_JAVA_GEN_DIR)/$* $(_VPATH_SRCS)
+	$(ELOG) $(XPIDL_COMPILE) -m java -w $(XPIDL_FLAGS) -I$(srcdir) -I$(IDL_DIR) -o $(_JAVA_GEN_DIR)/$* $(_VPATH_SRCS)
 	@touch $@
 
 # "Install" generated Java interfaces.  We segregate them based on the XPI_NAME.
 # If XPI_NAME is not set, install into the "default" directory.
 ifneq ($(XPI_NAME),)
 JAVA_INSTALL_DIR = $(JAVA_DIST_DIR)/$(XPI_NAME)
 else
 JAVA_INSTALL_DIR = $(JAVA_DIST_DIR)/default
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -1780,17 +1780,17 @@ GARBAGE_DIRS += $(JAVA_GEN_DIR)
 
 # generate .java files into _javagen/[package name dirs]
 _JAVA_GEN_DIR = $(JAVA_GEN_DIR)/$(JAVA_IFACES_PKG_NAME)
 $(_JAVA_GEN_DIR):
 	$(NSINSTALL) -D $@
 
 $(JAVA_GEN_DIR)/.%.java.pp: %.idl $(XPIDL_COMPILE) $(_JAVA_GEN_DIR)
 	$(REPORT_BUILD)
-	$(ELOG) $(XPIDL_COMPILE) -m java -w -I$(srcdir) -I$(IDL_DIR) -o $(_JAVA_GEN_DIR)/$* $(_VPATH_SRCS)
+	$(ELOG) $(XPIDL_COMPILE) -m java -w $(XPIDL_FLAGS) -I$(srcdir) -I$(IDL_DIR) -o $(_JAVA_GEN_DIR)/$* $(_VPATH_SRCS)
 	@touch $@
 
 # "Install" generated Java interfaces.  We segregate them based on the XPI_NAME.
 # If XPI_NAME is not set, install into the "default" directory.
 ifneq ($(XPI_NAME),)
 JAVA_INSTALL_DIR = $(JAVA_DIST_DIR)/$(XPI_NAME)
 else
 JAVA_INSTALL_DIR = $(JAVA_DIST_DIR)/default