Verified Commit 45b2ba09 authored by boklm's avatar boklm
Browse files

Bug 41736: Add generate_gradle_dependencies_list-$project makefile targets

parent ba70ed85

Makefile

+11 −2
Original line number Diff line number Diff line
@@ -455,8 +455,17 @@ 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-application-services: submodule-update

	$(rbm) build application-services --step get_gradle_dependencies_list --target nightly --target torbrowser-android-armv7

generate_gradle_dependencies_list-application-services: submodule-update

	$(rbm) build application-services --target generate_gradle_dependencies_list --target nightly --target torbrowser-android-armv7



generate_gradle_dependencies_list-geckoview: submodule-update

	$(rbm) build geckoview --target geckoview:generate_gradle_dependencies_list --target nightly --target torbrowser-android-armv7



generate_gradle_dependencies_list-geckoview-firefoxbrowser: submodule-update

	$(rbm) build geckoview --target geckoview:generate_gradle_dependencies_list --target alpha --target firefoxbrowser-android-aarch64



generate_gradle_dependencies_list-glean: submodule-update

	$(rbm) build glean --target generate_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-update-gradle-dependencies-list.md

+10 −15
Original line number Diff line number Diff line
@@ -2,21 +2,16 @@ 


## TL; DR



1. Open `projects/<project name>/config`.

2. Look for `# generate_gradle_dependencies_list: 1` and uncomment it.

3. Run `rbm/rbm build <project name> --target nightly --target torbrowser-android-<arch>`.

   For GeckoView, make sure to run a single-arch build to catch all dependencies

   at once.

   Testbuilds (i.e., `make torbrowser-testbuild-android-<arch>`) are single-arch

   by default, but you can also set `var/android_single_arch`.

4. Find the corresponding output: `ls -lt out/<project name> | head`.

5. Extract it.

6. Move the `gradle-dependencies-list.txt` you just extracted to

   `projects/<project name>/`. 



Theoretically, it should be also possible to set

`generate_gradle_dependencies_list: 1` in `rbm.local.conf`, run a full build and

update all dependencies at once.

For `application-services`, 'geckoview', `geckoview-firefoxbrowser`,

`glean`:



1. Run `make generate_gradle_dependencies_list-$project`

2. Copy `out/$project/gradle-dependencies-list-$version.txt`

   to `projects/$project/gradle-dependencies-list.txt`.



Note: The `generate_gradle_dependencies_list-geckoview-firefoxbrowser`

target is doing the same as the `generate_gradle_dependencies_list-geckoview-firefoxbrowser`

target, except that it is using unpatched upstream branch.



## Rationale

projects/application-services/build

+2 −0
Original line number Diff line number Diff line
@@ -94,6 +94,8 @@ cp target/release/nimbus-fml $distdir 
[% IF c('var/generate_gradle_dependencies_list') -%]

  cd $distdir

  $rootdir/gen-gradle-deps-file.py $gradle_logs

  cp gradle-dependencies-list.txt [% dest_dir _ '/' _ c('filename') %]

  [% RETURN -%]

[% END -%]



cd /var/tmp/dist

projects/application-services/config

+10 −3
Original line number Diff line number Diff line
@@ -26,9 +26,6 @@ var: 
  nspr_version: '4.38.2'

  nss_sha256sum: fb5aa56fa35d963d4c65278328e2e9c99c2484c86f0e41537412477739dcf997

  cargo_vendor_include_config: 1

  # Uncomment this to run an online build to grab an updated

  # gradle-dependencies-list.txt.

  # generate_gradle_dependencies_list: 1



targets:

  nightly:
@@ -91,6 +88,16 @@ steps: 
      - filename: gen-gradle-deps-file.py

        enable: '[% c("var/generate_gradle_dependencies_list") %]'



    targets:

      # Run `make get_gradle_dependencies_list-application-services` to

      # generate the gradle dependencies file. You can them move the file

      # `out/application-services/gradle-dependencies-list-$version.txt`

      # to `projects/application-services/gradle-dependencies-list.txt`.

      generate_gradle_dependencies_list:

        filename: 'gradle-dependencies-list-[% c("version") %].txt'

        var:

          generate_gradle_dependencies_list: 1



  list_toolchain_updates:

    git_hash: 'v[% c("version") %]'

    input_files: []

projects/geckoview/build

+0 −5
Original line number Diff line number Diff line
@@ -44,11 +44,6 @@ echo "Build finished, copying the AAR to the to the destination directory $(date 
[% IF !c("var/android_single_arch") -%]

  mkdir -p "$outdir/[% project %]"

  cp obj-*/gradle/target.maven.zip $outdir/[% project %]/



  [% IF c('var/generate_gradle_dependencies_list') -%]

    cd $outdir/[% project %]

    $rootdir/gen-gradle-deps-file.py $gradle_logs

  [% END -%]

[% ELSE -%]

[% INCLUDE 'build_ac_fenix' %]

[% END -%]