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
fixup! [android] Modify build system

Bug 43518: Fix TBB builds without topsrcdir defined

- - - - -


1 changed file:

- mobile/android/fenix/app/build.gradle


Changes:

=====================================
mobile/android/fenix/app/build.gradle
=====================================
@@ -315,7 +315,12 @@ android.applicationVariants.configureEach { variant ->
     if (project.hasProperty("disableTor")) {
         disableTor = project.getProperty("disableTor")
     }
-    System.setProperty("nimbusFml", 
"${topsrcdir}/mobile/android/fenix/tools/nimbus-fml")
+    // 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")
+    }
 
     println("----------------------------------------------")
     println("Variant name:      " + variant.name)



View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/778fb33d96b05734e574c7135ff5789dac13ea30

-- 
View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/778fb33d96b05734e574c7135ff5789dac13ea30
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]

Reply via email to