Bug 1239810: UpdateUtils.jsm requires the update.locale file to be shipped regardless of whether the application update is included. r=nalexander,rstrong
authorDave Townsend <dtownsend@oxymoronical.com>
Thu, 14 Jan 2016 15:19:44 -0800
changeset 280568 9004cc5221190af551829e4542f3e6cbd8ebbaf2
parent 280567 52b41d0b5edb9df5d3878e27407976675c04dca4
child 280569 489146770780d0fa8e7fdedd29c3d750cc4a365a
push id70504
push userdtownsend@mozilla.com
push dateTue, 19 Jan 2016 22:55:38 +0000
treeherdermozilla-inbound@9004cc522119 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander, rstrong
bugs1239810
milestone46.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1239810: UpdateUtils.jsm requires the update.locale file to be shipped regardless of whether the application update is included. r=nalexander,rstrong
mobile/android/installer/package-manifest.in
toolkit/locales/Makefile.in
--- a/mobile/android/installer/package-manifest.in
+++ b/mobile/android/installer/package-manifest.in
@@ -13,18 +13,18 @@
 ;
 
 #filter substitution
 
 [@AB_CD@]
 @BINPATH@/chrome/@AB_CD@@JAREXT@
 @BINPATH@/chrome/@AB_CD@.manifest
 @BINPATH@/@PREF_DIR@/mobile-l10n.js
+@BINPATH@/update.locale
 #ifdef MOZ_UPDATER
-@BINPATH@/update.locale
 @BINPATH@/updater.ini
 #endif
 @BINPATH@/dictionaries/*
 @BINPATH@/hyphenation/*
 
 [assets destdir="assets/@ANDROID_CPU_ARCH@"]
 #ifndef MOZ_STATIC_JS
 @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
--- a/toolkit/locales/Makefile.in
+++ b/toolkit/locales/Makefile.in
@@ -22,20 +22,18 @@ libs-%:
 # target to be used by multi-locale l10n builds, just add this locale
 # like regular chrome code
 chrome-%:
 	@$(MAKE) -C $(DEPTH)/netwerk/locales/ chrome AB_CD=$*
 	@$(MAKE) -C $(DEPTH)/dom/locales/ chrome AB_CD=$*
 	@$(MAKE) -C $(DEPTH)/security/manager/locales/ chrome AB_CD=$*
 	@$(MAKE) chrome AB_CD=$*
 
-ifdef MOZ_UPDATER
 libs:: update.locale
 	sed -e 's/%AB_CD%/$(AB_CD)/' $< > $(FINAL_TARGET)/update.locale
-endif
 
 ifdef MOZ_CRASHREPORTER
 libs:: crashreporter.ini
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/crashreporter.app/Contents/Resources
 else
 	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)
 endif