commit 54091ab8d4a431458105d2be5346ac5232fea265 Author: Matthew Finkel sysrqb@torproject.org Date: Fri Nov 8 01:47:32 2019 +0000

Bug 32365: Package multi-locale apk in a new way --- projects/firefox/build | 4 ++++ 1 file changed, 4 insertions(+)

diff --git a/projects/firefox/build b/projects/firefox/build index 456aa07..6b42d74 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -115,7 +115,11 @@ rm -f js/src/configure cp /var/tmp/dist/tba-translation/[% lang %]/torbrowser_strings.dtd /var/tmp/dist/locales/[% lang %]/mobile/android/base/ ./mach build chrome-[% lang %]; [% END %] + # Include localization for all available locales. + # mk is excluded above because Mozilla does not provide mk localization. + # mk is included here because we may have localization for torbutton. export MOZ_CHROME_MULTILOCALE='[% tmpl(c('var/locales').join(' ')) %]' + ./mach android assemble-app AB_CD=multi ./mach package # Copy the result over and return. There is nothing more to do for mobile. cp obj-*/dist/*unsigned-unaligned.apk [% dest_dir _ '/' _ c('filename') %]/tor-browser-unsigned-unaligned.apk