Pier Angelo Vendrame pushed to branch tor-browser-128.7.0esr-14.5-1 at The Tor Project / Applications / Tor Browser
Commits:
-
778fb33d
by Dan Ballard at 2025-02-26T12:27:00+01:00
1 changed file:
Changes:
... | ... | @@ -315,7 +315,12 @@ android.applicationVariants.configureEach { variant -> |
315 | 315 | if (project.hasProperty("disableTor")) {
|
316 | 316 | disableTor = project.getProperty("disableTor")
|
317 | 317 | }
|
318 | - System.setProperty("nimbusFml", "${topsrcdir}/mobile/android/fenix/tools/nimbus-fml")
|
|
318 | + // only set this property to pass to our patched application-service if it's defined in
|
|
319 | + // local.poperties, indicating this is a local dev build,
|
|
320 | + // otherwise we are in a TBB build env and the env var should be set and will be picked up
|
|
321 | + if (gradle.hasProperty('localProperties.dependencySubstitutions.geckoviewTopsrcdir')) {
|
|
322 | + System.setProperty("nimbusFml", "${topsrcdir}/mobile/android/fenix/tools/nimbus-fml")
|
|
323 | + }
|
|
319 | 324 | |
320 | 325 | println("----------------------------------------------")
|
321 | 326 | println("Variant name: " + variant.name)
|