Bug 1449624 - Make single-locale repacks use correct locale. r=mshal
This was an oversight in the landing of
Bug 1443208. We need to set
AB_CD explicitly for the invoked target, and, due to the way that
l10n.mk is written, we also need to set the additional internal
variables IS_LANGUAGE_REPACK and REAL_LOCALE_MERGEDIR.
MozReview-Commit-ID: 29lQXYiOf6a
--- a/mobile/android/locales/Makefile.in
+++ b/mobile/android/locales/Makefile.in
@@ -67,17 +67,17 @@ 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.
installers-%: IS_LANGUAGE_REPACK=1
installers-%:
$(MAKE) clobber-stage
$(MAKE) libs-$*
- $(MAKE) -C $(DEPTH)/mobile/android/base android_apks
+ $(MAKE) -C $(DEPTH)/mobile/android/base android_apks AB_CD=$* IS_LANGUAGE_REPACK=1 REAL_LOCALE_MERGEDIR=$(CURDIR)/merge-dir/$*
$(MAKE) package-langpack-$*
$(MAKE) repackage-zip-$*
@echo 'repackaging done'
# When we unpack fennec on MacOS X the platform.ini and application.ini are in slightly
# different locations that on all other platforms
ifeq (Darwin, $(OS_ARCH))
GECKO_PLATFORM_INI_PATH='$(STAGEDIST)/platform.ini'
