[tor-commits] [Git][tpo/applications/firefox-android][firefox-android-115.2.1-13.5-1] 2 commits: fixup! Modify build system

[Dan Ballard (@dan)]

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

Bug 42568: remove fetching TAS and TOP and fetch tor-expert-bundle-aar

- - - - -
742a038f by Dan Ballard at 2024-06-06T08:54:03-07:00
fixup! Add Tor integration and UI

Bug 42568: Removing tor-android-service and tor-onion-proxy and replacing with tor-expert-bundle-aar

- - - - -


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:

=====================================
fenix/app/.gitignore
=====================================
@@ -1,6 +1,3 @@
 /build
-/android-release.aar
-/jsocksAndroid-release.aar
-/service-release.aar
-/universal-0.0.3.jar
+/tor-expert-bundle.aar
 /src/main/assets/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi


=====================================
fenix/app/build.gradle
=====================================
@@ -704,12 +704,8 @@ dependencies {
     implementation 'org.slf4j:slf4j-api:1.7.25'
     implementation 'org.slf4j:slf4j-android:1.7.25'
 
-    // Tor Android Services.
-    implementation files('service-release.aar')
-
-    // Tor Onion Proxy Library.
-    implementation files('universal-0.0.3.jar')
-    implementation files('android-release.aar')
+    // Tor Expert Bundle
+    implementation files('tor-expert-bundle.aar')
 }
 
 protobuf {


=====================================
fenix/app/src/main/res/values/strings.xml
=====================================
@@ -2057,4 +2057,6 @@
     <string name="a11y_action_label_read_article">read the article</string>
     <!-- Action label for links to the Firefox Pocket website. Talkback will append this to say "Double tap to open link to learn more". -->
     <string name="a11y_action_label_pocket_learn_more">open link to learn more</string>
+
+    <string name="btn_cancel">Cancel</string>
 </resources>


=====================================
fenix/tools/tba-fetch-deps.sh
=====================================
@@ -6,20 +6,13 @@ if [ -z "$TOR_BROWSER_BUILD" ]; then
 	TOR_BROWSER_BUILD=../../tor-browser-build
 fi
 
-android_service="$(ls -1td "$TOR_BROWSER_BUILD/out/tor-android-service/"tor-android-service-* | head -1)"
-if [ -z "$android_service" ]; then
-	echo "Cannot find Tor Android Service artifacts!"
-	exit 1
-fi
-
-onion_proxy_library="$(ls -1td "$TOR_BROWSER_BUILD/out/tor-onion-proxy-library/"tor-onion-proxy-library-* | head -1)"
-if [ -z "$onion_proxy_library" ]; then
-	echo "Cannot find Tor Onion Proxy library artifacts!"
+tor_expert_bundle_aar="$(ls -1td "$TOR_BROWSER_BUILD/out/tor-expert-bundle-aar/"tor-expert-bundle-aar-* | head -1)"
+if [ -z "tor_expert_bundle_aar" ]; then
+	echo "Cannot find Tor Expert Bundle arr artifacts!"
 	exit 2
 fi
 
-cp "$android_service"/* app/
-cp "$onion_proxy_library"/* app/
+cp "$tor_expert_bundle_aar"/* app/
 
 noscript="$(find "$TOR_BROWSER_BUILD/out/browser" -name 'noscript*.xpi' -print | sort | tail -1)"
 mkdir -p "app/src/main/assets/extensions"



View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/compare/06b84467896784cf7b62494bb6a2d1ab50edfec0...742a038f9ccc3c60c847a670dce3fd6f3def42d5

-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/compare/06b84467896784cf7b62494bb6a2d1ab50edfec0...742a038f9ccc3c60c847a670dce3fd6f3def42d5
You're receiving this email because of your account on gitlab.torproject.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tor-commits/attachments/20240606/630ffd6f/attachment-0001.htm>