1411686 - Make --with-gradle support multi-locale builds

Status: RESOLVED FIXED

(Firefox Build System :: Android Studio and Gradle Integration, enhancement)

Description

[Nick Alexander :nalexander [he/him]]

Turns out that when I initially landed the --with-gradle support, I didn't implement the full "nodeps" mechanism required to produce our multi-locale builds.  Such builds do, in essence:

|mach build|, |mach package|, update l10n resources, |mach package|

That final |mach package| actually needs to rebuild the Android resources (to incorporate the new l10n resources).  moz.build just runs aapt and assumes (mostly correctly) that the R.java IDs are stable.  Gradle needs to re-run Gradle, and it turns out the R.java IDs are *not* stable, so that final |mach package| also needs to incorporate the newly produced classes.dex.

Comment 1

[Nick Alexander :nalexander [he/him]]

Attachment: Bug 1411686 - Pre: Fix JNI wrapper dependencies.

When built as part of a consuming application, a library's bundle*
target is called but not its assemble* target.  (When built by itself
for distribution, a library's assemble* target is called.)  This
corrects the wrapper dependencies.

Review commit: https://reviewboard.mozilla.org/r/193014/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/193014/

Comment 2

[Nick Alexander :nalexander [he/him]]

Attachment: Bug 1411686 - Part 1: Force Gradle to run during |mach package|.

It looks like I didn't handle this flow -- which only matters during
l10n multi-locale builds and l10n single-locale repacks -- during the
initial Gradle landing.  Now we need to handle it.

Remember that the l10n process runs |mach build && mach package|, and
then modifies the object directory by inserting new localized resource
files.  It then runs |mach package| again and expects to regenerate
the ap_ file, ready to splice it into the existing apk file.  The
existing code just copied the .ap_ built by Gradle without
regenerating the ap_ file.  This commit forces running Gradle again,
which will pick up the new resources in the object directory.

The chain of dependencies is:

|mach package| > gecko-nodeps.ap_ > .aapt.nodeps > .gradle.deps

and the latter two targets are FORCE, so they always get run
(regardless of the freshness of the inputs).

In fact, this runs the entire Gradle process again, including
producing classes.dex.  (The moz.build process doesn't compile the
Java source code again.)  This patch changes the existing behaviour to
copy the regenerated classes.dex into the repacked apk and avoid the
need for the R.java IDs to line up across the |mach build| and |mach
package| invocations.  This turned out to be necessary to support
multi-locale builds with newer Gradle versions, which don't appear to
preserve aapt R.java IDs across the

|mach build|, |mach package|, |mach compare-locales|, |mach package|

chain.

Review commit: https://reviewboard.mozilla.org/r/193016/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/193016/

Comment 3

[Nick Alexander :nalexander [he/him]]

Attachment: Bug 1411686 - Part 2: Don't invoke |make gradle-targets| for AB_CD=multi.

This work-around isn't needed for the moz.build system because there's
no equivalent of the

|mach build| > |mach gradle| > |make gradle-targets|

dependency chain that "re-enters" Make processing.  That is, the
nodeps mechanism ensures that nothing in m/a/b/Makefile.in (that knows
about AB_CD) ever sees AB_CD=multi.

Review commit: https://reviewboard.mozilla.org/r/193018/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/193018/

Comment 4

[Max Liu [:maliu]]

Comment on attachment 8922027 [details]
Bug 1411686 - Pre: Fix JNI wrapper dependencies.

https://reviewboard.mozilla.org/r/193014/#review199332

Comment 5

[Max Liu [:maliu]]

Comment on attachment 8922028 [details]
Bug 1411686 - Part 1: Force Gradle to run during |mach package|.

https://reviewboard.mozilla.org/r/193016/#review199334

Comment 6

[Max Liu [:maliu]]

Comment on attachment 8922029 [details]
Bug 1411686 - Part 2: Don't invoke |make gradle-targets| for AB_CD=multi.

https://reviewboard.mozilla.org/r/193018/#review199336

Comment 7

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/1b2815b0c7f7
Pre: Fix JNI wrapper dependencies. r=maliu
https://hg.mozilla.org/integration/autoland/rev/11aeb89a63f0
Part 1: Force Gradle to run during |mach package|. r=maliu
https://hg.mozilla.org/integration/autoland/rev/1e44cf9fed8b
Part 2: Don't invoke |make gradle-targets| for AB_CD=multi. r=maliu

Comment 8

[Sebastian Hengst [:aryx] (needinfo me if it's about an intermittent or backout)]

https://hg.mozilla.org/mozilla-central/rev/1b2815b0c7f7
https://hg.mozilla.org/mozilla-central/rev/11aeb89a63f0
https://hg.mozilla.org/mozilla-central/rev/1e44cf9fed8b