Bug 1449624 - Make single-locale repacks use correct locale. r=mshal
☠☠ backed out by 44aceee694be ☠ ☠
authorNick Alexander <nalexander@mozilla.com>
Tue, 20 Mar 2018 17:00:38 -0700
changeset 410709 eed14f951a09e36cd238c03b24511c8a0712bee6
parent 410654 7686c4ee6bcbb4f15cb2dc47096169f0b1167ca8
child 410710 b895a035f5e355a3380d5fb147d091be1e4808a5
push id33735
push usershindli@mozilla.com
push dateFri, 30 Mar 2018 09:55:46 +0000
treeherdermozilla-central@3f37287132bf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1449624, 1443208
milestone61.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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. MozReview-Commit-ID: 29lQXYiOf6a
mobile/android/locales/Makefile.in
--- 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=$*
 	$(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'