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
-
22ad3eca
by Dan Ballard at 2025-02-13T11:43:11-08:00
3 changed files:
Changes:
| ... | ... | @@ -359,7 +359,7 @@ media/libvpx/config/**/config.log |
| 359 | 359 | mobile/android/.experimenter.json
|
| 360 | 360 | |
| 361 | 361 | # Tor libraries for local builds
|
| 362 | -mobile/android/fenix/app/nimbus-fml
|
|
| 362 | +mobile/android/fenix/tools/nimbus-fml
|
|
| 363 | 363 | mobile/android/fenix/app/tor-expert-bundle.aar
|
| 364 | 364 | mobile/android/fenix/app/src/main/assets/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi
|
| 365 | 365 |
| ... | ... | @@ -315,6 +315,8 @@ android.applicationVariants.configureEach { variant -> |
| 315 | 315 | if (project.hasProperty("disableTor")) {
|
| 316 | 316 | disableTor = project.getProperty("disableTor")
|
| 317 | 317 | }
|
| 318 | + System.setProperty("nimbusFml", rootProject.projectDir.toPath().resolve("tools").resolve("nimbus-fml").toAbsolutePath().toString())
|
|
| 319 | + |
|
| 318 | 320 | |
| 319 | 321 | println("----------------------------------------------")
|
| 320 | 322 | println("Variant name: " + variant.name)
|
| ... | ... | @@ -323,6 +325,7 @@ android.applicationVariants.configureEach { variant -> |
| 323 | 325 | println("Flavor: " + variant.flavorName)
|
| 324 | 326 | println("Telemetry enabled: " + !isDebugOrDCD)
|
| 325 | 327 | println("Tor is disabled: " + disableTor)
|
| 328 | + println("nimbusFml: " + System.getProperty("nimbusFml"))
|
|
| 326 | 329 | |
| 327 | 330 | buildConfigField "boolean", "DISABLE_TOR", "$disableTor"
|
| 328 | 331 |
| ... | ... | @@ -47,7 +47,7 @@ if [ "$os" = "unsupported" ] || [ "$arch" = "unsupported" ]; then |
| 47 | 47 | exit 2
|
| 48 | 48 | fi
|
| 49 | 49 | |
| 50 | -app_services="$(find "$TOR_BROWSER_BUILD/out/application-services" -name 'application-services*.tar.zst' -print | sort | tail -1)"
|
|
| 50 | +app_services="$(ls -1t "$TOR_BROWSER_BUILD/out/application-services/"application-services*.tar.zst | head -1)"
|
|
| 51 | 51 | mkdir -p "$GRADLE_MAVEN_REPOSITORIES/org/mozilla"
|
| 52 | 52 | if [ -f "$app_services" ]; then
|
| 53 | 53 | tar -C /tmp -xf "$app_services"
|
| ... | ... | @@ -67,14 +67,14 @@ if [ -f "$app_services" ]; then |
| 67 | 67 | unzip -d /tmp/nimbus-fml /tmp/nimbus-fml.zip
|
| 68 | 68 | nimbus_fml="$(find "/tmp/nimbus-fml/" -name 'nimbus-fml*' | grep "$arch-$os")"
|
| 69 | 69 | echo "Using nimbus-fml binary: $nimbus_fml"
|
| 70 | - cp $nimbus_fml app/
|
|
| 70 | + cp $nimbus_fml tools/
|
|
| 71 | 71 | |
| 72 | 72 | rm -rf /tmp/nimbus-fml
|
| 73 | 73 | rm /tmp/nimbus-fml.zip
|
| 74 | 74 | else
|
| 75 | - cp /tmp/application-services/nimbus-fml app/
|
|
| 75 | + cp /tmp/application-services/nimbus-fml tools/
|
|
| 76 | 76 | fi
|
| 77 | - chmod +x app/nimbus-fml
|
|
| 77 | + chmod +x tools/nimbus-fml
|
|
| 78 | 78 | |
| 79 | 79 | rm -rf /tmp/application-services
|
| 80 | 80 | else
|