Dan Ballard pushed to branch firefox-android-115.2.1-13.5-1 at The Tor Project / Applications / firefox-android
Commits:
-
9f6dee17
by Dan Ballard at 2024-06-06T08:53:14-07:00
-
742a038f
by Dan Ballard at 2024-06-06T08:54:03-07:00
4 changed files:
- fenix/app/.gitignore
- fenix/app/build.gradle
- fenix/app/src/main/res/values/strings.xml
- fenix/tools/tba-fetch-deps.sh
Changes:
| 1 | 1 | /build
|
| 2 | -/android-release.aar
|
|
| 3 | -/jsocksAndroid-release.aar
|
|
| 4 | -/service-release.aar
|
|
| 5 | -/universal-0.0.3.jar
|
|
| 2 | +/tor-expert-bundle.aar
|
|
| 6 | 3 | /src/main/assets/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi |
| ... | ... | @@ -704,12 +704,8 @@ dependencies { |
| 704 | 704 | implementation 'org.slf4j:slf4j-api:1.7.25'
|
| 705 | 705 | implementation 'org.slf4j:slf4j-android:1.7.25'
|
| 706 | 706 | |
| 707 | - // Tor Android Services.
|
|
| 708 | - implementation files('service-release.aar')
|
|
| 709 | - |
|
| 710 | - // Tor Onion Proxy Library.
|
|
| 711 | - implementation files('universal-0.0.3.jar')
|
|
| 712 | - implementation files('android-release.aar')
|
|
| 707 | + // Tor Expert Bundle
|
|
| 708 | + implementation files('tor-expert-bundle.aar')
|
|
| 713 | 709 | }
|
| 714 | 710 | |
| 715 | 711 | protobuf {
|
| ... | ... | @@ -2057,4 +2057,6 @@ |
| 2057 | 2057 | <string name="a11y_action_label_read_article">read the article</string>
|
| 2058 | 2058 | <!-- Action label for links to the Firefox Pocket website. Talkback will append this to say "Double tap to open link to learn more". -->
|
| 2059 | 2059 | <string name="a11y_action_label_pocket_learn_more">open link to learn more</string>
|
| 2060 | + |
|
| 2061 | + <string name="btn_cancel">Cancel</string>
|
|
| 2060 | 2062 | </resources> |
| ... | ... | @@ -6,20 +6,13 @@ if [ -z "$TOR_BROWSER_BUILD" ]; then |
| 6 | 6 | TOR_BROWSER_BUILD=../../tor-browser-build
|
| 7 | 7 | fi
|
| 8 | 8 | |
| 9 | -android_service="$(ls -1td "$TOR_BROWSER_BUILD/out/tor-android-service/"tor-android-service-* | head -1)"
|
|
| 10 | -if [ -z "$android_service" ]; then
|
|
| 11 | - echo "Cannot find Tor Android Service artifacts!"
|
|
| 12 | - exit 1
|
|
| 13 | -fi
|
|
| 14 | - |
|
| 15 | -onion_proxy_library="$(ls -1td "$TOR_BROWSER_BUILD/out/tor-onion-proxy-library/"tor-onion-proxy-library-* | head -1)"
|
|
| 16 | -if [ -z "$onion_proxy_library" ]; then
|
|
| 17 | - echo "Cannot find Tor Onion Proxy library artifacts!"
|
|
| 9 | +tor_expert_bundle_aar="$(ls -1td "$TOR_BROWSER_BUILD/out/tor-expert-bundle-aar/"tor-expert-bundle-aar-* | head -1)"
|
|
| 10 | +if [ -z "tor_expert_bundle_aar" ]; then
|
|
| 11 | + echo "Cannot find Tor Expert Bundle arr artifacts!"
|
|
| 18 | 12 | exit 2
|
| 19 | 13 | fi
|
| 20 | 14 | |
| 21 | -cp "$android_service"/* app/
|
|
| 22 | -cp "$onion_proxy_library"/* app/
|
|
| 15 | +cp "$tor_expert_bundle_aar"/* app/
|
|
| 23 | 16 | |
| 24 | 17 | noscript="$(find "$TOR_BROWSER_BUILD/out/browser" -name 'noscript*.xpi' -print | sort | tail -1)"
|
| 25 | 18 | mkdir -p "app/src/main/assets/extensions"
|