Bug 709391 - Part 2: l10n build changes to include Sync strings. r=blassey, f=Pike, a=akeybl
authorRichard Newman <rnewman@mozilla.com>
Wed, 21 Dec 2011 08:44:06 -0800
changeset 84214 7b15cf9b89facef74fc74717a9ea638bb3e6c6d3
parent 84213 2bf61c2d0e29d42b08d7c26202a3d8d157e156e1
child 84215 50911c719782a59d4d8c1b72ae29c071425ec2fe
push id775
push userrnewman@mozilla.com
push dateThu, 26 Jan 2012 04:30:14 +0000
treeherdermozilla-aurora@b310cea4258c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersblassey, akeybl
bugs709391
milestone11.0a2
Bug 709391 - Part 2: l10n build changes to include Sync strings. r=blassey, f=Pike, a=akeybl
mobile/android/base/locales/Makefile.in
mobile/android/base/strings.xml.in
--- a/mobile/android/base/locales/Makefile.in
+++ b/mobile/android/base/locales/Makefile.in
@@ -42,16 +42,17 @@ VPATH     = @srcdir@
 relativesrcdir = mobile/android/base/locales
 
 include $(DEPTH)/config/autoconf.mk
 
 # special case some locale codes, he and id
 # 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)
 else
 BRANDPATH = $(call core_abspath,$(DIST)/xpi-stage/$(XPI_NAME)/chrome/$(AB_CD)/locale/branding/brand.dtd)
 endif
 
 DEFINES += -DAB_CD=$(AB_CD)
@@ -62,12 +63,13 @@ chrome-%:: AB_CD=$*
 chrome-%:: 
 	@$(MAKE) ../res/values-$(AB_rCD)/strings.xml AB_CD=$*
 
 %/strings.xml: FORCE
 	$(NSINSTALL) -D $*
 	$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) \
 	  -DBRANDPATH="$(BRANDPATH)" \
 	  -DSTRINGSPATH="$(STRINGSPATH)" \
+	  -DSYNCSTRINGSPATH="$(SYNCSTRINGSPATH)" \
 	  $(srcdir)/../strings.xml.in \
 	  > $@
 
 include $(topsrcdir)/config/rules.mk
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -1,13 +1,14 @@
 #filter substitution
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE resources [
 #includesubst @BRANDPATH@
 #includesubst @STRINGSPATH@
+#includesubst @SYNCSTRINGSPATH@
 ]>
 <resources>
 #include ../sync/strings.xml.in
   <string name="splash_firstrun">&splash_firstrun;</string>
   <string name="no_space_to_start_error">&no_space_to_start_error;</string>
   <string name="error_loading_file">&error_loading_file;</string>
 
   <string name="awesomebar_all_pages_title">&awesomebar_all_pages_title;</string>