boklm pushed to branch main at The Tor Project / Applications / tor-browser-build

Commits:

2 changed files:

Changes:

  • Makefile
    ... ... @@ -623,15 +623,9 @@ create_glean_deps_tarball: submodule-update
    623 623
     create_glean_deps_tarball-with_torsocks: submodule-update
    
    624 624
     	$(rbm) build glean-parser --target alpha --target torbrowser-android-armv7 --target with_torsocks
    
    625 625
     
    
    626
    -get_gradle_dependencies_list-fenix: submodule-update
    
    627
    -	$(rbm) build fenix --step get_gradle_dependencies_list --target nightly --target torbrowser-android-armv7
    
    628
    -
    
    629 626
     get_gradle_dependencies_list-application-services: submodule-update
    
    630 627
     	$(rbm) build application-services --step get_gradle_dependencies_list --target nightly --target torbrowser-android-armv7
    
    631 628
     
    
    632
    -get_gradle_dependencies_list-android-components: submodule-update
    
    633
    -	$(rbm) build android-components --step get_gradle_dependencies_list --target nightly --target torbrowser-android-armv7
    
    634
    -
    
    635 629
     cargo_vendor-application-services: submodule-update
    
    636 630
     	$(rbm) build application-services --step cargo_vendor --target nightly --target torbrowser-android-armv7
    
    637 631
     
    

  • doc/how-to-create-gradle-dependencies-list.txt
    ... ... @@ -3,41 +3,25 @@ If additional Android dependencies are required by the project's build, then
    3 3
     the Gradle build will fail due to missing dependencies. To find out what the
    
    4 4
     missing dependencies are take the following steps.
    
    5 5
     
    
    6
    -1) Updating gradle dependencies for `application-services`, `android-components`
    
    7
    -   or `fenix`
    
    6
    +1) Updating gradle dependencies for `application-services`
    
    8 7
     
    
    9 8
     The following makefile rules can be used:
    
    10 9
     
    
    11 10
       make get_gradle_dependencies_list-application-services
    
    12
    -  make get_gradle_dependencies_list-android-components
    
    13
    -  make get_gradle_dependencies_list-fenix
    
    14 11
     
    
    15 12
     which should create the gradle-dependencies-list.txt files in the
    
    16 13
     corresponding out/$project directory, using nightly's branch.
    
    17 14
     
    
    18
    -Note: `android-components` and `fenix` require modified `geckoview` and
    
    19
    -`android-components` artifacts to compile successfully. In order to generate the
    
    20
    -necessary dependencies for them you need to point to the respective
    
    21
    -`android-components` and `fenix` commits our patches are based upon, too, first.
    
    22
    -That way the code as Mozilla is shipping it is used for the Gradle dependencies
    
    23
    -fetching which should avoid issues caused by broken builds (it is not guaranteed
    
    24
    -that all the dependencies are already fetched at the point when the build
    
    25
    -breaks). For `fenix` dependencies there is still a manual processing required
    
    26
    -afterwards right now as e.g. our tor-android-service related artifacts are not
    
    27
    -picked up.
    
    28 15
     
    
    16
    +2) Updating gradle dependencies for `geckoview`
    
    29 17
     
    
    30
    -2) Updating gradle dependencies for `geckoview`, `tor-android-service`
    
    31
    -   or `tor-onion-proxy-library`
    
    32
    -
    
    33
    -The `geckoview`, `tor-android-service` and `tor-onion-proxy-library`
    
    34
    -projects don't have (yet) a makefile rule to generate their
    
    18
    +The `geckoview` project doesn't have (yet) a makefile rule to generate the
    
    35 19
     gradle-dependencies-list.txt file, so a few more steps are needed.
    
    36 20
     
    
    37 21
     For the geckoview project, comment out the following line in the project's
    
    38
    -build file:
    
    22
    +build_common file:
    
    39 23
     
    
    40
    -   export GRADLE_MAVEN_REPOSITORIES="file://$gradle_repo"
    
    24
    +   export GRADLE_MAVEN_REPOSITORIES="file://$gradle_repo","file://$gradle_repo/maven2"
    
    41 25
     
    
    42 26
     Also modify the gradle flags to include the debug option so the download logs will show up:
    
    43 27