From 93938b5b2b8bf236e6e5c43f9da502588e1b84fd Mon Sep 17 00:00:00 2001 From: Nick Alexander Date: Fri, 15 Dec 2017 12:19:15 -0800 Subject: [PATCH] Bug 1413240 - Build webext langpack for mobile/android. r=gandalf This cargo cults a few things from browser/ and works when following the instructions from https://bugzilla.mozilla.org/show_bug.cgi?id=1413240#c0. MozReview-Commit-ID: ciA7nfc8BR --HG-- extra : rebase_source : 30edde6d670dd9a081a691959d298066895ab335 --- mobile/android/build.mk | 3 +-- mobile/android/locales/Makefile.in | 9 +++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/mobile/android/build.mk b/mobile/android/build.mk index 3fd6e314f988..e75b4c4a7bf4 100644 --- a/mobile/android/build.mk +++ b/mobile/android/build.mk @@ -56,8 +56,7 @@ wget-en-US: # make -j1 because dependencies in l10n build targets don't work # with parallel builds -# Not exposing langpack-% because that doesn't work on Android -merge-% installers-% chrome-%: +merge-% installers-% langpack-% chrome-%: $(MAKE) -j1 -C mobile/android/locales $@ ifdef ENABLE_TESTS diff --git a/mobile/android/locales/Makefile.in b/mobile/android/locales/Makefile.in index ce536e2dfc1c..4d91107aaf46 100644 --- a/mobile/android/locales/Makefile.in +++ b/mobile/android/locales/Makefile.in @@ -18,6 +18,12 @@ PP_TARGETS += L10N_PREF_JS_EXPORTS include $(topsrcdir)/config/rules.mk +# Required for l10n.mk - defines a list of app sub dirs that should +# be included in langpack xpis. +DIST_SUBDIRS = $(DIST_SUBDIR) + +MOZ_LANGPACK_EID=langpack-$(AB_CD)@firefox.mozilla.org + include $(topsrcdir)/toolkit/locales/l10n.mk # need to kill stage for repacks for now due to the library moves @@ -56,6 +62,8 @@ ifeq ($(OS_TARGET),Android) @$(MAKE) -C $(DEPTH)/mobile/android/base/locales chrome-$* endif +langpack: langpack-$(AB_CD) + # 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. @@ -63,6 +71,7 @@ installers-%: IS_LANGUAGE_REPACK=1 installers-%: @$(MAKE) clobber-stage @$(MAKE) libs-$* + @$(MAKE) package-langpack-$* @$(MAKE) repackage-zip-$* @echo 'repackaging done'