Verified Commit 0412200e authored by boklm's avatar boklm
Browse files

Bug 41764: Add new makefile rule: generate_gradle_dependencies_list-application-services-unpatched 

The same as generate_gradle_dependencies_list-application-services, but
using upstream branch.

Also rename `generate_gradle_dependencies_list-geckoview-firefoxbrowser`
to `generate_gradle_dependencies_list-geckoview-upatched`.
parent 333552f7

Makefile

+4 −1
Original line number Diff line number Diff line
@@ -443,10 +443,13 @@ create_glean_deps_tarball-with_torsocks: submodule-update 
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-application-services-unpatched: submodule-update

	$(rbm) build application-services --target list_toolchain_updates --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

generate_gradle_dependencies_list-geckoview-unpatched: submodule-update

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



generate_gradle_dependencies_list-glean: submodule-update

doc/how-to-update-gradle-dependencies-list.md

+3 −5
Original line number Diff line number Diff line
@@ -2,16 +2,14 @@ 


## TL; DR



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

`glean`:

For `application-services`, `geckoview`, `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.

Note: For `geckoview` and `application-services` you can append

`-unpatched` to the makefile target to use the unpatched upstream branch.



## Rationale

projects/application-services/config

+4 −0
Original line number Diff line number Diff line
@@ -99,6 +99,10 @@ steps: 
      # 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`.

      #

      # If you want to build from upstream applications-services (for example

      # if the rebase has not been done yet), you can use `make

      # generate_gradle_dependencies_list-application-services-unpatched`.

      generate_gradle_dependencies_list:

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

        var: