boklm pushed to branch main at The Tor Project / Applications /
tor-browser-build
Commits:
1426aa6f by Nicolas Vigier at 2025-11-20T12:02:05+01:00
Bug 41636: Remove obsolete fenix and android-components makefile rules
Remove `-get_gradle_dependencies_list-fenix` and
`get_gradle_dependencies_list-android-components` makefile rules.
- - - - -
5ba8b6fd by Nicolas Vigier at 2025-11-20T12:06:51+01:00
Bug 41636: Update doc/how-to-create-gradle-dependencies-list.txt
Remove references to removed projects:
- application-services
- fenix
- tor-android-service
- tor-onion-proxy-library
And update instructions for geckoview.
- - - - -
2 changed files:
- Makefile
- doc/how-to-create-gradle-dependencies-list.txt
Changes:
=====================================
Makefile
=====================================
@@ -623,15 +623,9 @@ create_glean_deps_tarball: submodule-update
create_glean_deps_tarball-with_torsocks: submodule-update
$(rbm) build glean-parser --target alpha --target
torbrowser-android-armv7 --target with_torsocks
-get_gradle_dependencies_list-fenix: submodule-update
- $(rbm) build fenix --step get_gradle_dependencies_list --target nightly
--target torbrowser-android-armv7
-
get_gradle_dependencies_list-application-services: submodule-update
$(rbm) build application-services --step get_gradle_dependencies_list
--target nightly --target torbrowser-android-armv7
-get_gradle_dependencies_list-android-components: submodule-update
- $(rbm) build android-components --step get_gradle_dependencies_list
--target nightly --target torbrowser-android-armv7
-
cargo_vendor-application-services: submodule-update
$(rbm) build application-services --step cargo_vendor --target nightly
--target torbrowser-android-armv7
=====================================
doc/how-to-create-gradle-dependencies-list.txt
=====================================
@@ -3,41 +3,25 @@ If additional Android dependencies are required by the
project's build, then
the Gradle build will fail due to missing dependencies. To find out what the
missing dependencies are take the following steps.
-1) Updating gradle dependencies for `application-services`,
`android-components`
- or `fenix`
+1) Updating gradle dependencies for `application-services`
The following makefile rules can be used:
make get_gradle_dependencies_list-application-services
- make get_gradle_dependencies_list-android-components
- make get_gradle_dependencies_list-fenix
which should create the gradle-dependencies-list.txt files in the
corresponding out/$project directory, using nightly's branch.
-Note: `android-components` and `fenix` require modified `geckoview` and
-`android-components` artifacts to compile successfully. In order to generate
the
-necessary dependencies for them you need to point to the respective
-`android-components` and `fenix` commits our patches are based upon, too,
first.
-That way the code as Mozilla is shipping it is used for the Gradle dependencies
-fetching which should avoid issues caused by broken builds (it is not
guaranteed
-that all the dependencies are already fetched at the point when the build
-breaks). For `fenix` dependencies there is still a manual processing required
-afterwards right now as e.g. our tor-android-service related artifacts are not
-picked up.
+2) Updating gradle dependencies for `geckoview`
-2) Updating gradle dependencies for `geckoview`, `tor-android-service`
- or `tor-onion-proxy-library`
-
-The `geckoview`, `tor-android-service` and `tor-onion-proxy-library`
-projects don't have (yet) a makefile rule to generate their
+The `geckoview` project doesn't have (yet) a makefile rule to generate the
gradle-dependencies-list.txt file, so a few more steps are needed.
For the geckoview project, comment out the following line in the project's
-build file:
+build_common file:
- export GRADLE_MAVEN_REPOSITORIES="file://$gradle_repo"
+ export
GRADLE_MAVEN_REPOSITORIES="file://$gradle_repo","file://$gradle_repo/maven2"
Also modify the gradle flags to include the debug option so the download logs
will show up:
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/de81ac36a9cf68d4306a542e0e37b0a00462d1bf...5ba8b6fdf83b2c183c08b4fb93d95c9805fd5b97
--
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/de81ac36a9cf68d4306a542e0e37b0a00462d1bf...5ba8b6fdf83b2c183c08b4fb93d95c9805fd5b97
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]
