Noissue - Prepare translations

mobile/android/base/locales/Makefile.in

 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 include $(topsrcdir)/config/config.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))))
 
 # The search strings path is always passed to strings.xml.in; the
 # decision to include is made based on the feature flag at the
 # inclusion site.
 SEARCHSTRINGSPATH = $(abspath $(call MERGE_FILE,search_strings.dtd))
 
 SYNCSTRINGSPATH = $(abspath $(call MERGE_FILE,sync_strings.dtd))
 STRINGSPATH = $(abspath $(call MERGE_FILE,android_strings.dtd))
+ABBSTRINGSPATH = $(or $(wildcard $(srcdir)/abb/$(ABr_CD)/android_strings.dtd), \
+  $(wildcard $(srcdir)/abb/$(AB_CD)/android_strings.dtd), \
+  $(srcdir)/abb/en-US/android_strings.dtd)
 ifeq (,$(XPI_NAME))
 BRANDPATH = $(abspath $(DEPTH)/dist/bin/chrome/$(AB_CD)/locale/branding/brand.dtd)
 else
 BRANDPATH = $(abspath $(DIST)/xpi-stage/$(XPI_NAME)/chrome/$(AB_CD)/locale/branding/brand.dtd)
 endif
 $(warnIfEmpty,AB_CD) # todo: $(errorIfEmpty )
 
 dir-res-values := ../res/values
 strings-xml    := $(dir-res-values)/strings.xml
 strings-xml-in := $(srcdir)/../strings.xml.in
@@ skipping 32 matching lines @@
 strings-xml-bypath  = $(filter %/strings.xml,$(MAKECMDGOALS))
 ifeq (,$(strip $(strings-xml-bypath)))
   strings-xml-bypath = $(strings-xml)
 endif
 dir-strings-xml = $(patsubst %/,%,$(dir $(strings-xml-bypath)))
 
 strings-xml-preqs =\
   $(strings-xml-in) \
   $(BRANDPATH) \
   $(STRINGSPATH) \
+  $(ABBSTRINGSPATH) \
   $(SEARCHSTRINGSPATH) \
   $(SYNCSTRINGSPATH) \
   $(BOOKMARKSPATH) \
   $(if $(IS_LANGUAGE_REPACK),FORCE) \
   $(NULL)
 
 $(if $(MOZ_ANDROID_SHARED_ACCOUNT_TYPE),,$(error Missing MOZ_ANDROID_SHARED_ACCOUNT_TYPE))
 $(if $(MOZ_ANDROID_SHARED_FXACCOUNT_TYPE),,$(error Missing MOZ_ANDROID_SHARED_FXACCOUNT_TYPE))
 
 $(dir-strings-xml)/strings.xml: $(strings-xml-preqs)
         $(call py_action,preprocessor, \
       $(DEFINES) \
           -DANDROID_PACKAGE_NAME=$(ANDROID_PACKAGE_NAME) \
           -DBOOKMARKSPATH='$(BOOKMARKSPATH)' \
           -DBRANDPATH='$(BRANDPATH)' \
           -DMOZ_ANDROID_SHARED_ACCOUNT_TYPE=$(MOZ_ANDROID_SHARED_ACCOUNT_TYPE) \
           -DMOZ_ANDROID_SHARED_FXACCOUNT_TYPE=$(MOZ_ANDROID_SHARED_FXACCOUNT_TYPE) \
           -DMOZ_APP_DISPLAYNAME='@MOZ_APP_DISPLAYNAME@' \
           -DSTRINGSPATH='$(STRINGSPATH)' \
+          -DABBSTRINGSPATH='$(ABBSTRINGSPATH)' \
           -DSYNCSTRINGSPATH='$(SYNCSTRINGSPATH)' \
           -DSEARCHSTRINGSPATH='$(SEARCHSTRINGSPATH)' \
       $< \
           -o $@)
 
 # Arg 1: Valid Make identifier, like suggestedsites.
 # Arg 2: File name, like suggestedsites.json.
 define generated_file_template
 
 # Determine the ../res/raw[-*] path.  This can be ../res/raw when no
@@ skipping 24 matching lines @@
                 $@)
 
 $(eval $(call generated_file_template,browsersearch,browsersearch.json))
 
 $(browsersearch-dstdir-raw)/browsersearch.json: FORCE
         $(call py_action,generate_browsersearch, \
                 --verbose \
                 $(if $(filter en-US,$(AB_CD)),,--srcdir=$(l10n-srcdir)) \
                 --srcdir=$(topsrcdir)/mobile/locales/en-US/chrome \
                 $@)