Bug 709391 - Part 2: l10n build changes to include Sync strings. r=blassey, f=Pike

mobile/android/base/locales/Makefile.in

@@ -47,6 +47,7 @@ include $(DEPTH)/config/autoconf.mk
 # http://code.google.com/p/android/issues/detail?id=3639
 AB_rCD = $(if $(filter he, $(AB_CD)),iw,$(if $(filter id, $(AB_CD)),in,$(subst -,-r,$(AB_CD))))
 
+SYNCSTRINGSPATH = $(call core_abspath,$(call MERGE_FILE,sync_strings.dtd))
 STRINGSPATH = $(call core_abspath,$(call MERGE_FILE,android_strings.dtd))
 ifeq (,$(XPI_NAME))
 BRANDPATH = $(call core_abspath,$(DEPTH)/dist/bin/chrome/$(AB_CD)/locale/branding/brand.dtd)
@@ -67,6 +68,7 @@ chrome-%::
 	$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) \
 	  -DBRANDPATH="$(BRANDPATH)" \
 	  -DSTRINGSPATH="$(STRINGSPATH)" \
+	  -DSYNCSTRINGSPATH="$(SYNCSTRINGSPATH)" \
 	  $(srcdir)/../strings.xml.in \
 	  > $@
 

mobile/android/base/strings.xml.in

@@ -3,6 +3,7 @@
 <!DOCTYPE resources [
 #includesubst @BRANDPATH@
 #includesubst @STRINGSPATH@
+#includesubst @SYNCSTRINGSPATH@
 ]>
 <resources>
 #include ../sync/strings.xml.in