Bug 1048042 - Port |Bug 780159 - Remove obsolete REGCHROME| and |Bug 935387 - Remove non recursed install targets| to comm-central - REGCHROME part r=standard8 a=for CLOSED TREE
authorIan Neal <iann_cvs@blueyonder.co.uk>
Wed, 13 Aug 2014 22:04:28 +0100
changeset 16465 c92946ba1b289a6ca2ce27938ff1a88a94ebcd8a
parent 16464 56a8f8fca711670e01322ef519d9419e18dd6e9f
child 16466 55ef732fc9617a7eacf7e6f9678ed6d284bf73c7
push id1234
push usermbanner@mozilla.com
push dateMon, 13 Oct 2014 17:59:18 +0000
treeherdercomm-esr52@b5a0add9fb18 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersstandard8, for
bugs1048042, 780159, 935387
Bug 1048042 - Port |Bug 780159 - Remove obsolete REGCHROME| and |Bug 935387 - Remove non recursed install targets| to comm-central - REGCHROME part r=standard8 a=for CLOSED TREE
config/rules.mk
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -1374,33 +1374,16 @@ endif
 
 tools::
 	$(RM) -r '$(DIST)/bin/extensions/$(INSTALL_EXTENSION_ID)'
 	$(NSINSTALL) -D '$(DIST)/bin/extensions/$(INSTALL_EXTENSION_ID)'
 	$(call copy_dir,$(FINAL_TARGET),$(DIST)/bin$(DIST_SUBDIR:%=/%)/extensions/$(INSTALL_EXTENSION_ID))
 
 endif
 
-ifneq (,$(filter flat symlink,$(MOZ_CHROME_FILE_FORMAT)))
-_JAR_REGCHROME_DISABLE_JAR=1
-else
-_JAR_REGCHROME_DISABLE_JAR=0
-endif
-
-REGCHROME = $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/add-chrome.pl \
-	$(if $(filter gtk2,$(MOZ_WIDGET_TOOLKIT)),-x) \
-	$(if $(CROSS_COMPILE),-o $(OS_ARCH)) $(FINAL_TARGET)/chrome/installed-chrome.txt \
-	$(_JAR_REGCHROME_DISABLE_JAR)
-
-REGCHROME_INSTALL = $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/add-chrome.pl \
-	$(if $(filter gtk2,$(MOZ_WIDGET_TOOLKIT)),-x) \
-	$(if $(CROSS_COMPILE),-o $(OS_ARCH)) $(DESTDIR)$(mozappdir)/chrome/installed-chrome.txt \
-	$(_JAR_REGCHROME_DISABLE_JAR)
-
-
 #############################################################################
 # MDDEPDIR is the subdirectory where all the dependency files are placed.
 #   This uses a make rule (instead of a macro) to support parallel
 #   builds (-jN). If this were done in the LOOP_OVER_DIRS macro, two
 #   processes could simultaneously try to create the same directory.
 #
 #   We use $(CURDIR) in the rule's target to ensure that we don't find
 #   a dependency directory in the source tree via VPATH (perhaps from