Dan Ballard pushed to branch tor-browser-128.7.0esr-14.5-1 at The Tor Project /
Applications / Tor Browser
Commits:
b374c1f2 by Dan Ballard at 2025-02-13T11:43:11-08:00
fixup! TB 42669: [android] Use custom no-op app-services
Bug 42669: get latest application services by date and put in tools
- - - - -
22ad3eca by Dan Ballard at 2025-02-13T11:43:11-08:00
fixup! [android] Modify build system
Bug 42669: Inject gradle property for nimbus-fml path for application services
- - - - -
3 changed files:
- .gitignore
- mobile/android/fenix/app/build.gradle
- mobile/android/fenix/tools/tba-fetch-deps.sh
Changes:
=====================================
.gitignore
=====================================
@@ -359,7 +359,7 @@ media/libvpx/config/**/config.log
mobile/android/.experimenter.json
# Tor libraries for local builds
-mobile/android/fenix/app/nimbus-fml
+mobile/android/fenix/tools/nimbus-fml
mobile/android/fenix/app/tor-expert-bundle.aar
mobile/android/fenix/app/src/main/assets/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi
=====================================
mobile/android/fenix/app/build.gradle
=====================================
@@ -315,6 +315,8 @@ android.applicationVariants.configureEach { variant ->
if (project.hasProperty("disableTor")) {
disableTor = project.getProperty("disableTor")
}
+ System.setProperty("nimbusFml",
rootProject.projectDir.toPath().resolve("tools").resolve("nimbus-fml").toAbsolutePath().toString())
+
println("----------------------------------------------")
println("Variant name: " + variant.name)
@@ -323,6 +325,7 @@ android.applicationVariants.configureEach { variant ->
println("Flavor: " + variant.flavorName)
println("Telemetry enabled: " + !isDebugOrDCD)
println("Tor is disabled: " + disableTor)
+ println("nimbusFml: " + System.getProperty("nimbusFml"))
buildConfigField "boolean", "DISABLE_TOR", "$disableTor"
=====================================
mobile/android/fenix/tools/tba-fetch-deps.sh
=====================================
@@ -47,7 +47,7 @@ if [ "$os" = "unsupported" ] || [ "$arch" = "unsupported" ];
then
exit 2
fi
-app_services="$(find "$TOR_BROWSER_BUILD/out/application-services" -name
'application-services*.tar.zst' -print | sort | tail -1)"
+app_services="$(ls -1t
"$TOR_BROWSER_BUILD/out/application-services/"application-services*.tar.zst |
head -1)"
mkdir -p "$GRADLE_MAVEN_REPOSITORIES/org/mozilla"
if [ -f "$app_services" ]; then
tar -C /tmp -xf "$app_services"
@@ -67,14 +67,14 @@ if [ -f "$app_services" ]; then
unzip -d /tmp/nimbus-fml /tmp/nimbus-fml.zip
nimbus_fml="$(find "/tmp/nimbus-fml/" -name 'nimbus-fml*' |
grep "$arch-$os")"
echo "Using nimbus-fml binary: $nimbus_fml"
- cp $nimbus_fml app/
+ cp $nimbus_fml tools/
rm -rf /tmp/nimbus-fml
rm /tmp/nimbus-fml.zip
else
- cp /tmp/application-services/nimbus-fml app/
+ cp /tmp/application-services/nimbus-fml tools/
fi
- chmod +x app/nimbus-fml
+ chmod +x tools/nimbus-fml
rm -rf /tmp/application-services
else
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/e01fb03c9e53a3684e4027a3a9acf628ce0e259c...22ad3ecafb5572d30cf5c6f986bc06d19fb6188d
--
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/e01fb03c9e53a3684e4027a3a9acf628ce0e259c...22ad3ecafb5572d30cf5c6f986bc06d19fb6188d
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]
