This is an automated email from the git hooks/post-receive script.

pierov pushed a commit to branch tor-browser-102.4.0esr-12.0-2 in repository tor-browser.

The following commit(s) were added to refs/heads/tor-browser-102.4.0esr-12.0-2 by this push: new 475909e9d0fa amend! Bug 40857: Modified the fat .aar creation file 475909e9d0fa is described below

commit 475909e9d0fae881d31f42a11e8f84affd0897df Author: Pier Angelo Vendrame pierov@torproject.org AuthorDate: Wed Nov 16 17:12:15 2022 +0100

amend! Bug 40857: Modified the fat .aar creation file

Tweaks to the build system

Bug 40857: Modified the fat .aar creation file

This is a workaround to build fat .aars with the compiling enviornment disabled. Mozilla does not use a similar configuration, but either runs a Firefox build and discards its output, or uses artifacts build.

We might switch to artifact builds too, and drop this patch, or write a better one to upstream. But until then we need this patch.

See also https://bugzilla.mozilla.org/show_bug.cgi?id=1763770.

Bug 41458: Prevent `mach package-multi-locale` from actually creating a package

macOS builds need some files to be moved around with ./mach package-multi-locale to create multi-locale packages. The required command isn't exposed through any other mach command. So, we patch package-multi-locale both to prevent it from failing when doing official builds and to detect any future changes on it. --- python/mozbuild/mozbuild/mach_commands.py | 4 ++++ 1 file changed, 4 insertions(+)

diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuild/mach_commands.py index 9f340ee7584d..114089b798d4 100644 --- a/python/mozbuild/mozbuild/mach_commands.py +++ b/python/mozbuild/mozbuild/mach_commands.py @@ -2508,6 +2508,10 @@ def package_l10n(command_context, verbose=False, locales=[]): target = ["package"] if command_context.substs["MOZ_BUILD_APP"] == "mobile/android": target.append("AB_CD=multi") + else: + # tor-browser#41458 and tor-browser-build#40687: do not actually + # create the package (at least on desktop) + return 0

command_context._run_make( directory=command_context.topobjdir,