Dan Ballard pushed to branch tor-browser-128.9.0esr-14.5-1 at The Tor Project /
Applications / Tor Browser
Commits:
1c2cd6e8 by Dan Ballard at 2025-04-03T18:17:41+00:00
fixup! [android] Modify build system
Always set gradle pref for nimbusFml as tbb's env var NIMBUS_FML supercedes it
- - - - -
1 changed file:
- mobile/android/fenix/app/build.gradle
Changes:
=====================================
mobile/android/fenix/app/build.gradle
=====================================
@@ -311,12 +311,14 @@ android.applicationVariants.configureEach { variant ->
def isDebugOrDCD = isDebug || isDataCollectionDisabled
def useReleaseVersioning =
variant.buildType.buildConfigFields['USE_RELEASE_VERSIONING']?.value ?: false
- // only set this property to pass to our patched application-service if
it's defined in
- // local.poperties, indicating this is a local dev build,
- // otherwise we are in a TBB build env and the env var should be set and
will be picked up
- if
(gradle.hasProperty('localProperties.dependencySubstitutions.geckoviewTopsrcdir'))
{
- System.setProperty("nimbusFml",
"${topsrcdir}/mobile/android/fenix/tools/nimbus-fml")
- }
+ // env var NIMBUS_FML always overrides this in the tbb built patched
application services
+ //
https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/blob/main/projects/application-services/offline-nimbus-fml.diff?ref_type=heads
+ // so safe to have always set so local builds and supply their expected
location as fetched by
+ // fenix/tools/tba-fetch-deps.sh
+ // We normalize the path because it is valid to open/build from both tb
and fenix roots
+ def normalizedTBPath =
rootProject.projectDir.absolutePath.minus("mobile/android/fenix")
+ System.setProperty("nimbusFml", normalizedTBPath +
"/mobile/android/fenix/tools/nimbus-fml")
+
def disableTor = false
if (project.hasProperty("disableTor")) {
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1c2cd6e82e5c0da1deed4f137e4c5e737d0d90c9
--
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1c2cd6e82e5c0da1deed4f137e4c5e737d0d90c9
You're receiving this email because of your account on gitlab.torproject.org.
_______________________________________________
tbb-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
