This is an automated email from the git hooks/post-receive script.
pierov pushed a commit to branch tor-browser-102.0.1-12.0-1 in repository tor-browser.
commit 8561bc736f4abbb25868bc4825dad4f40bbd0f10 Author: Pier Angelo Vendrame pierov@torproject.org AuthorDate: Wed Apr 6 22:34:02 2022 +0200
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. --- mobile/android/gradle/with_gecko_binaries.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/mobile/android/gradle/with_gecko_binaries.gradle b/mobile/android/gradle/with_gecko_binaries.gradle index 702c4bacc629b..170d7feecd5af 100644 --- a/mobile/android/gradle/with_gecko_binaries.gradle +++ b/mobile/android/gradle/with_gecko_binaries.gradle @@ -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