[tor-commits] [tor-browser-build/master] Update our Gradle dependencies creation instructions

[sysrqb@xxxxxxxxxxxxxx]

commit 1f4a684fb6cb1c83a092171bd529259c896daa6b
Author: Georg Koppen <gk@xxxxxxxxxxxxxx>
Date:   Mon Aug 24 08:27:19 2020 +0000

    Update our Gradle dependencies creation instructions
---
 projects/common/how-to-create-gradle-dependencies-list.txt | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/projects/common/how-to-create-gradle-dependencies-list.txt b/projects/common/how-to-create-gradle-dependencies-list.txt
index 3ecdbf6..3435c31 100644
--- a/projects/common/how-to-create-gradle-dependencies-list.txt
+++ b/projects/common/how-to-create-gradle-dependencies-list.txt
@@ -3,8 +3,9 @@ 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.
 
-When calling gradle in the project's build script replace the `--offline` flag
-with `--debug` and remove any `-Dmaven.repo.local` arguments.
+If the dependencies for `application-services`, `android-components`, or `fenix`
+are needed, set the `fetch_gradle_dependencies` flag in their `config` files to
+`1`.
 
 For the firefox project, comment out the following line in the project's build file:
 
@@ -14,7 +15,10 @@ Also modify the gradle flags to include the debug option so the download logs wi
 
    export GRADLE_FLAGS="--no-daemon --debug"
 
-Then allow network access during the build by setting
+Otherwise, when calling gradle in the project's build script replace the
+`--offline` flag with `--debug` and remove any `-Dmaven.repo.local` arguments.
+
+Finally, allow network access during the build by setting
 `var/container/disable_network/build` to `0` in rbm.conf, and rerun the build.
 
 Dependent artifacts will show up as downloads in the logs. You can pull out
@@ -26,4 +30,4 @@ list script in the tools directory:
 Copy the resulting `gradle-dependencies-list.txt` over the one in the respective
 project. Then, in the project's config file, increment the
 `var/gradle_dependencies_version` and make sure to restore the project's build
-file back to original.
+file back to original or set `fetch_gradle_dependencies` to `0` again.



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits