commit 9b258abde2b5aae749c7f225b08fb91b94453071
parent 80054b797c8891d35e0f1305f74cfeff18f72867
Author: Pier Angelo Vendrame <pierov@torproject.org>
Date: Wed, 6 Apr 2022 22:34:02 +0200
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.
Diffstat:
10 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/browser/app/moz.build b/browser/app/moz.build
@@ -77,7 +77,8 @@ if CONFIG["OS_ARCH"] == "WINNT":
RCINCLUDE = "splash.rc"
DIRS += [
"installation_dir_layout",
- "pbproxy",
+ # tor-browser#41798 don't build private_browsing.exe on Windows
+ # "pbproxy",
"winlauncher",
]
USE_LIBS += [
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
@@ -152,10 +152,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
#ifndef XP_MACOSX
@BINPATH@/@MOZ_APP_NAME@-bin
diff --git a/mobile/android/gradle/with_gecko_binaries.gradle b/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
diff --git a/mobile/android/mach_commands.py b/mobile/android/mach_commands.py
@@ -197,8 +197,7 @@ def android_archive_geckoview(command_context, args):
if ret != 0:
return ret
- if "MOZ_AUTOMATION" in os.environ:
- create_maven_archive(command_context.topobjdir)
+ create_maven_archive(command_context.topobjdir)
return 0
diff --git a/python/mach/mach/telemetry.py b/python/mach/mach/telemetry.py
@@ -313,6 +313,7 @@ def prompt_telemetry_message_contributor():
def initialize_telemetry_setting(settings, topsrcdir: str, state_dir: str):
"""Enables telemetry for employees or prompts the user."""
+ return
# If the user doesn't care about telemetry for this invocation, then
# don't make requests to Bugzilla and/or prompt for whether the
# user wants to opt-in.
diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuild/mach_commands.py
@@ -3708,6 +3708,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,
diff --git a/python/sites/mach.txt b/python/sites/mach.txt
@@ -58,7 +58,7 @@ pth:xpcom/geckoprocesstypes_generator
pth:xpcom/idl-parser
# glean-sdk may not be installable if a wheel isn't available
# and it has to be built from source.
-pypi-optional:glean-sdk==66.2.0:telemetry will not be collected
+# pypi-optional:glean-sdk==66.2.0:telemetry will not be collected
pypi-optional:orjson>=3.10:json operations will be slower in various tools
# Mach gracefully handles the case where `psutil` is unavailable.
# We aren't (yet) able to pin packages in automation, so we have to
diff --git a/testing/testsuite-targets.mk b/testing/testsuite-targets.mk
@@ -151,7 +151,7 @@ download-wpt-manifest:
$(call py_action,download_wpt_manifest)
define package_archive
-package-tests-$(1): stage-all package-tests-prepare-dest download-wpt-manifest
+package-tests-$(1): stage-all package-tests-prepare-dest
$$(call py_action,test_archive, \
$(1) \
'$$(abspath $$(test_archive_dir))/$$(PKG_BASENAME).$(1).tests.$(2)')
diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk
@@ -136,7 +136,7 @@ make-package: FORCE
$(MAKE) make-package-internal
ifeq (WINNT,$(OS_ARCH))
ifeq ($(MOZ_PKG_FORMAT),ZIP)
- $(MAKE) -C windows ZIP_IN='$(ABS_DIST)/$(PACKAGE)' installer
+# $(MAKE) -C windows ZIP_IN='$(ABS_DIST)/$(PACKAGE)' installer
endif
endif
ifdef MOZ_AUTOMATION
diff --git a/toolkit/mozapps/installer/upload-files.mk b/toolkit/mozapps/installer/upload-files.mk
@@ -136,9 +136,9 @@ ifeq ($(MOZ_PKG_FORMAT),DMG)
_ABS_MOZSRCDIR = $(shell cd $(MOZILLA_DIR) && pwd)
PKG_DMG_SOURCE = $(MOZ_PKG_DIR)
- MOZ_PKG_MAC_DSSTORE=$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/dsstore
- MOZ_PKG_MAC_BACKGROUND=$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/background.png
- MOZ_PKG_MAC_ICON=$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/disk.icns
+ MOZ_PKG_MAC_DSSTORE?=$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/dsstore
+ MOZ_PKG_MAC_BACKGROUND?=$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/background.png
+ MOZ_PKG_MAC_ICON?=$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/disk.icns
INNER_MAKE_PACKAGE = \
$(call py_action,make_dmg, \
$(if $(MOZ_PKG_MAC_DSSTORE),--dsstore '$(MOZ_PKG_MAC_DSSTORE)') \
