Skip to content
Snippets Groups Projects
Verified Commit ba961d98 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame :jack_o_lantern:
Browse files

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.
parent 5165c55f
No related branches found
No related tags found
1 merge request!735Bug 42033: Rebased release onto 102.15.0esr (last 102.x release!)
......@@ -198,7 +198,7 @@ ext.configureVariantWithGeckoBinaries = { variant ->
def distDir = "${topobjdir}/dist/geckoview"
def syncOmnijarFromDistDir
if (hasCompileArtifacts()) {
if (hasCompileArtifacts() || true) {
syncOmnijarFromDistDir = task("syncOmnijarFromDistDirFor${variant.name.capitalize()}", type: Sync) {
onlyIf {
if (source.empty) {
......@@ -254,7 +254,7 @@ ext.configureVariantWithGeckoBinaries = { variant ->
} }()
syncLibsFromDistDir.onlyIf { task ->
if (!hasCompileArtifacts()) {
if (!hasCompileArtifacts() || true) {
// We won't have JNI libraries if we're not compiling and we're not downloading
// artifacts. Such a configuration is used for running lints, generating docs, etc.
return true
......@@ -272,7 +272,7 @@ 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
......
......@@ -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,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment