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
1 changed file:
Changes:
| ... | ... | @@ -311,12 +311,14 @@ android.applicationVariants.configureEach { variant -> |
| 311 | 311 | def isDebugOrDCD = isDebug || isDataCollectionDisabled
|
| 312 | 312 | def useReleaseVersioning = variant.buildType.buildConfigFields['USE_RELEASE_VERSIONING']?.value ?: false
|
| 313 | 313 | |
| 314 | - // only set this property to pass to our patched application-service if it's defined in
|
|
| 315 | - // local.poperties, indicating this is a local dev build,
|
|
| 316 | - // otherwise we are in a TBB build env and the env var should be set and will be picked up
|
|
| 317 | - if (gradle.hasProperty('localProperties.dependencySubstitutions.geckoviewTopsrcdir')) {
|
|
| 318 | - System.setProperty("nimbusFml", "${topsrcdir}/mobile/android/fenix/tools/nimbus-fml")
|
|
| 319 | - }
|
|
| 314 | + // env var NIMBUS_FML always overrides this in the tbb built patched application services
|
|
| 315 | + // https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/blob/main/projects/application-services/offline-nimbus-fml.diff?ref_type=heads
|
|
| 316 | + // so safe to have always set so local builds and supply their expected location as fetched by
|
|
| 317 | + // fenix/tools/tba-fetch-deps.sh
|
|
| 318 | + // We normalize the path because it is valid to open/build from both tb and fenix roots
|
|
| 319 | + def normalizedTBPath = rootProject.projectDir.absolutePath.minus("mobile/android/fenix")
|
|
| 320 | + System.setProperty("nimbusFml", normalizedTBPath + "/mobile/android/fenix/tools/nimbus-fml")
|
|
| 321 | + |
|
| 320 | 322 | |
| 321 | 323 | def disableTor = false
|
| 322 | 324 | if (project.hasProperty("disableTor")) {
|