merge mozilla-central to autoland. r=merge a=merge

browser/base/content/test/static/browser_all_files_referenced.js

@@ -99,9 +99,6 @@ var whitelist = [
   {file: "resource://gre/modules/ClusterLib.js"},
   {file: "resource://gre/modules/ColorConversion.js"},
 
-  // List of built-in locales. See bug 1362617 for details.
-  {file: "resource://gre/res/multilocale.json"},
-
   // The l10n build system can't package string files only for some platforms.
   {file: "resource://gre/chrome/en-US/locale/en-US/global-platform/mac/accessible.properties",
    platforms: ["linux", "win"]},

browser/installer/Makefile.in

@@ -12,8 +12,6 @@ MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in
 MOZ_PKG_MANIFEST = $(srcdir)/package-manifest.in
 MOZ_PKG_DUPEFLAGS = -f $(srcdir)/allowed-dupes.mn
 
-DEFINES += -DPKG_LOCALE_MANIFEST=$(topobjdir)/toolkit/locales/locale-manifest.in
-
 # Some files have been already bundled with xulrunner
 ifndef MOZ_MULET
 MOZ_PKG_FATAL_WARNINGS = 1

browser/installer/package-manifest.in

@@ -47,6 +47,8 @@
 [@AB_CD@]
 @RESPATH@/browser/chrome/@AB_CD@@JAREXT@
 @RESPATH@/browser/chrome/@AB_CD@.manifest
+@RESPATH@/chrome/@AB_CD@@JAREXT@
+@RESPATH@/chrome/@AB_CD@.manifest
 @RESPATH@/dictionaries/*
 #if defined(XP_WIN) || defined(XP_LINUX)
 @RESPATH@/fonts/*
@@ -837,7 +839,3 @@ bin/libfreebl_32int64_3.so
 @RESPATH@/fix_linux_stack.py
 #endif
 #endif
-
-#ifdef PKG_LOCALE_MANIFEST
-#include @PKG_LOCALE_MANIFEST@
-#endif

mobile/android/installer/Makefile.in

@@ -19,7 +19,11 @@ MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in
 MOZ_PKG_MANIFEST = $(srcdir)/package-manifest.in
 MOZ_PKG_DUPEFLAGS = -f $(srcdir)/allowed-dupes.mn
 
-DEFINES += -DPKG_LOCALE_MANIFEST=$(topobjdir)/toolkit/locales/locale-manifest.in
+ifdef MOZ_CHROME_MULTILOCALE
+MOZ_PKG_MANIFEST_DEPS = locale-manifest.in
+
+DEFINES += -DPKG_LOCALE_MANIFEST=$(CURDIR)/locale-manifest.in
+endif
 
 DEFINES += \
   -DMOZ_APP_NAME=$(MOZ_APP_NAME) \
@@ -80,3 +84,22 @@ DEFINES += -DBINPATH=$(BINPATH)
 ifdef ENABLE_MARIONETTE
 DEFINES += -DENABLE_MARIONETTE=1
 endif
+
+
+ifdef MOZ_CHROME_MULTILOCALE
+# When MOZ_CHROME_MULTILOCALE is defined, we write multilocale.json like:
+# {"locales": ["en-US", "de", "ar", ...]}
+locale-manifest.in: $(GLOBAL_DEPS) FORCE
+	printf '\n[multilocale]\n' > $@
+	printf '@BINPATH@/res/multilocale.json\n' >> $@
+	for LOCALE in en-US $(MOZ_CHROME_MULTILOCALE) ;\
+	do \
+	  printf '$(BINPATH)/chrome/'"$$LOCALE"'$(JAREXT)\n' >> $@; \
+	  printf '$(BINPATH)/chrome/'"$$LOCALE"'.manifest\n' >> $@; \
+	done
+	COMMA=,
+	echo '{"locales": [$(foreach l,$(MOZ_CHROME_MULTILOCALE),"$(l)"$(COMMA)) "en-US"]}' \
+	  > $(FINAL_TARGET)/res/multilocale.json
+
+GARBAGE += locale-manifest.in
+endif

mobile/android/installer/package-manifest.in

@@ -15,6 +15,8 @@
 #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

toolkit/locales/Makefile.in

@@ -38,30 +38,3 @@ else
 	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)
 endif
 endif
-
-libs:: locale-manifest.in
-
-MOZ_CHROME_MULTILOCALE?=en-US
-
-# Firefox uses @RESPATH@.
-# Fennec uses @BINPATH@ and doesn't have the @RESPATH@ variable defined.
-ifeq ($(MOZ_BUILD_APP),mobile/android)
-BASE_PATH:=@BINPATH@
-else
-BASE_PATH:=@RESPATH@
-endif
-
-locale-manifest.in: $(GLOBAL_DEPS) FORCE
-	printf '\n[multilocale]\n' > $@
-	printf '$(BASE_PATH)/res/multilocale.json\n' >> $@
-	for LOCALE in $(MOZ_CHROME_MULTILOCALE) ;\
-	do \
-	  printf '$(BASE_PATH)/chrome/'"$$LOCALE"'@JAREXT@\n' >> $@; \
-	  printf '$(BASE_PATH)/chrome/'"$$LOCALE"'.manifest\n' >> $@; \
-	done
-	COMMA=,
-	#XXX: It would be nice to not duplicate en-US here, but makefile makes it hard.
-	echo '{"locales": [$(foreach l,$(MOZ_CHROME_MULTILOCALE),"$(l)"$(COMMA)) "en-US"]}' \
-	  > $(DIST)/bin/res/multilocale.json
-
-GARBAGE += locale-manifest.in