Bug 594017 - Add embedding/android localization stuff to fennec, r=mfinkle a=blocking-fennec
authorMichael Wu <mwu@mozilla.com>
Wed, 22 Dec 2010 13:13:22 -0800
changeset 67161 6f20af7c60854d376d4694ad760342e21886a223
parent 67160 c0ab7b3eaa08fe7e071e4a80b03078162a3ef11f
child 67162 a22af73ea47fdcfcfb7b1dcd5d818c82e63b3685
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle, blocking-fennec
bugs594017
Bug 594017 - Add embedding/android localization stuff to fennec, r=mfinkle a=blocking-fennec
mobile/locales/Makefile.in
mobile/locales/filter.py
mobile/locales/l10n.ini
--- a/mobile/locales/Makefile.in
+++ b/mobile/locales/Makefile.in
@@ -118,16 +118,19 @@ libs-%:
 # Tailored target to just add the chrome processing for multi-locale builds
 chrome-%:
 	@$(MAKE) -C $(DEPTH)/toolkit/locales chrome-$*
 	@$(MAKE) -C $(DEPTH)/services/sync/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
 	@$(MAKE) -B bookmarks.json AB_CD=$*
 	@$(MAKE) -B searchplugins AB_CD=$*
 	@$(MAKE) chrome AB_CD=$*
 	@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales chrome AB_CD=$*
+ifeq ($(OS_TARGET),Android)
+	@$(MAKE) -C $(DEPTH)/embedding/android chrome AB_CD=$*
+endif
 
 # This is a generic target that will make a langpack and repack tarball
 # builds. It is called from the tinderbox scripts. Alter it with caution.
 
 installers-%: clobber-% langpack-% repackage-zip-%
 	@echo "repackaging done"
 
 NO_JA_JP_MAC_AB_CD := $(if $(filter ja-JP-mac, $(AB_CD)),ja,$(AB_CD))
--- a/mobile/locales/filter.py
+++ b/mobile/locales/filter.py
@@ -35,16 +35,17 @@
 #
 # ***** END LICENSE BLOCK *****
 
 
 def test(mod, path, entity = None):
   import re
   # ignore anything but mobile, which is our local repo checkout name
   if mod not in ("netwerk", "dom", "toolkit", "security/manager",
+                 "services/sync", "embedding/android",
                  "mobile"):
     return False
 
   # Ignore Lorentz strings, at least temporarily
   if mod == "toolkit" and path == "chrome/mozapps/plugins/plugins.dtd":
     if entity.startswith('reloadPlugin.'): return False
     if entity.startswith('report.'): return False
 
--- a/mobile/locales/l10n.ini
+++ b/mobile/locales/l10n.ini
@@ -5,14 +5,21 @@ all = locales/all-locales
 
 [compare]
 dirs = mobile
 tld = mobile
 
 [includes]
 toolkit = toolkit/locales/l10n.ini
 services_sync = services/sync/locales/l10n.ini
+embedding_android = embedding/android/locales/l10n.ini
 
 [include_toolkit]
 type = hg
 mozilla = mozilla-central
 repo = http://hg.mozilla.org/
 l10n.ini = toolkit/locales/l10n.ini
+
+[include_embedding_android]
+type = hg
+mozilla = mozilla-central
+repo = http://hg.mozilla.org/
+l10n.ini = embedding/android/locales/l10n.ini