Bug 1239810: UpdateUtils.jsm requires the update.locale file to be shipped regardless of whether the application update is included. r?rstrong draft
authorDave Townsend <dtownsend@oxymoronical.com>
Thu, 14 Jan 2016 15:19:44 -0800
changeset 321866 8306f83e29a57772b8b7b21015dd66a45b46c807
parent 321865 b6ef37a7673e9829de96d0439244343948545955
child 512979 ecdb4a1301f3a53261b8a7a629827c3e0bc66e4c
push id9470
push userdtownsend@mozilla.com
push dateThu, 14 Jan 2016 23:21:19 +0000
reviewersrstrong
bugs1239810
milestone46.0a1
Bug 1239810: UpdateUtils.jsm requires the update.locale file to be shipped regardless of whether the application update is included. r?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