Merge m-c to b-i.
authorRyan VanderMeulen <ryanvm@gmail.com>
Tue, 03 Dec 2013 17:43:24 -0500
changeset 158720 7f6a53b49f8e1f9c51fdfd7b89a2d8923141bc22
parent 158719 94b8161eb20aae33d2bb41494a23c64efebe1d5f (current diff)
parent 158610 9ac7ed427cd22058835b3f6bb700b38e41725756 (diff)
child 158721 d997913037df89a04960346a36de1860425d6458
push id25754
push usercbook@mozilla.com
push dateWed, 04 Dec 2013 08:48:02 +0000
treeherdermozilla-central@9688476c1544 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone28.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
Merge m-c to b-i.
--- a/b2g/installer/Makefile.in
+++ b/b2g/installer/Makefile.in
@@ -60,15 +60,15 @@ endif
 
 ifdef MOZ_PKG_MANIFEST_P
 $(MOZ_PKG_MANIFEST): $(MOZ_PKG_MANIFEST_P) FORCE
 	$(call py_action,preprocessor,$(DEFINES) $(ACDEFINES) $< -o $@)
 ifdef MOZ_CHROME_MULTILOCALE
 	printf '\n[multilocale]\n' >> $@
 	for LOCALE in $(MOZ_CHROME_MULTILOCALE) ;\
 	do \
-	  printf '$(BINPATH)/chrome/$$LOCALE$(JAREXT)\n' >> $@; \
-	  printf '$(BINPATH)/chrome/$$LOCALE.manifest\n' >> $@; \
+	  printf '$(BINPATH)/chrome/'"$$LOCALE"'$(JAREXT)\n' >> $@; \
+	  printf '$(BINPATH)/chrome/'"$$LOCALE"'.manifest\n' >> $@; \
 	done
 endif
 
 GARBAGE += $(MOZ_PKG_MANIFEST)
 endif
--- a/mobile/android/installer/Makefile.in
+++ b/mobile/android/installer/Makefile.in
@@ -47,15 +47,15 @@ endif
 
 ifdef MOZ_PKG_MANIFEST_P
 $(MOZ_PKG_MANIFEST): $(MOZ_PKG_MANIFEST_P) $(GLOBAL_DEPS)
 	$(call py_action,preprocessor,$(DEFINES) $(ACDEFINES) $< -o $@)
 ifdef MOZ_CHROME_MULTILOCALE
 	printf '\n[multilocale]\n' >> $@
 	for LOCALE in en-US $(MOZ_CHROME_MULTILOCALE) ;\
 	do \
-	  printf '$(BINPATH)/chrome/$$LOCALE$(JAREXT)\n' >> $@; \
-	  printf '$(BINPATH)/chrome/$$LOCALE.manifest\n' >> $@; \
+	  printf '$(BINPATH)/chrome/'"$$LOCALE"'$(JAREXT)\n' >> $@; \
+	  printf '$(BINPATH)/chrome/'"$$LOCALE"'.manifest\n' >> $@; \
 	done
 endif
 
 GARBAGE += $(MOZ_PKG_MANIFEST)
 endif
--- a/security/build/Makefile.in
+++ b/security/build/Makefile.in
@@ -375,27 +375,27 @@ DEFFILE = nss3.def
 
 nss3.def: $(NSS_STATIC_LIBS_DEFS) $(DEPTH)/db/sqlite3/src/sqlite-processed.def
 	echo LIBRARY nss3$(DLL_SUFFIX) > $@.tmp
 	echo EXPORTS >> $@.tmp
 	grep -v -h -e ^LIBRARY -e ^EXPORTS -e ^\; $^ >> $@.tmp
 	mv $@.tmp $@
 endif
 
-endif # MOZ_FOLD_LIBS
-
-include $(topsrcdir)/config/rules.mk
-
-ifdef MOZ_FOLD_LIBS
 ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
 SDK_LIBRARY = $(IMPORT_LIBRARY)
 else
 SDK_LIBRARY = $(SHARED_LIBRARY)
 endif
 
+endif # MOZ_FOLD_LIBS
+
+include $(topsrcdir)/config/rules.mk
+
+ifdef MOZ_FOLD_LIBS
 # Force the linker to include everything from the static libraries.
 EXPAND_LIBS_EXEC += --extract
 
 $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS)
 
 EXTRA_DSO_LDOPTS += $(REALTIME_LIBS)
 
 ifdef IMPORT_LIB_SUFFIX