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.

browser/app/moz.build

@@ -70,7 +70,8 @@ if CONFIG["CC_TYPE"] == "clang-cl":
 if CONFIG["OS_ARCH"] == "WINNT":
     RCINCLUDE = "splash.rc"
     DIRS += [
-        "pbproxy",
+        # tor-browser#41798 don't build private_browsing.exe on Windows
+        # "pbproxy",
         "winlauncher",
     ]
     USE_LIBS += [

browser/installer/package-manifest.in

@@ -135,10 +135,10 @@
 @BINPATH@/firefox.VisualElementsManifest.xml
 @BINPATH@/browser/VisualElements/VisualElements_150.png
 @BINPATH@/browser/VisualElements/VisualElements_70.png
-@BINPATH@/private_browsing.exe
-@BINPATH@/private_browsing.VisualElementsManifest.xml
-@BINPATH@/browser/VisualElements/PrivateBrowsing_150.png
-@BINPATH@/browser/VisualElements/PrivateBrowsing_70.png
+; @BINPATH@/private_browsing.exe
+; @BINPATH@/private_browsing.VisualElementsManifest.xml
+; @BINPATH@/browser/VisualElements/PrivateBrowsing_150.png
+; @BINPATH@/browser/VisualElements/PrivateBrowsing_70.png
 #else
 @BINPATH@/@MOZ_APP_NAME@-bin
 @BINPATH@/@MOZ_APP_NAME@

mobile/android/gradle/with_gecko_binaries.gradle

@@ -16,7 +16,7 @@ def hasCompileArtifacts() {
 }
 
 ext.configureVariantWithGeckoBinaries = { variant ->
-    if (hasCompileArtifacts()) {
+    if (hasCompileArtifacts() || true) {
         // Local (read, not 'official') builds want to reflect developer changes to
         // the omnijar sources, and (when compiling) to reflect developer changes to
         // the native binaries.  To do this, the Gradle build calls out to the

python/mozbuild/mozbuild/mach_commands.py

@@ -2855,6 +2855,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,