Closed Bug 1411686 Opened 2 years ago Closed 2 years ago

Make --with-gradle support multi-locale builds

Categories

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

enhancement
Not set

Tracking

(firefox58 fixed)

RESOLVED FIXED
mozilla58
Tracking Status
firefox58 --- fixed

People

(Reporter: nalexander, Assigned: nalexander)

References

Details

Attachments

(3 files)

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 on attachment 8922027 [details]
Bug 1411686 - Pre: Fix JNI wrapper dependencies.

https://reviewboard.mozilla.org/r/193014/#review199332
Attachment #8922027 - Flags: review?(max) → review+
Comment on attachment 8922028 [details]
Bug 1411686 - Part 1: Force Gradle to run during |mach package|.

https://reviewboard.mozilla.org/r/193016/#review199334
Attachment #8922028 - Flags: review?(max) → review+
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
Attachment #8922029 - Flags: review?(max) → review+
Pushed by nalexander@mozilla.com:
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
Product: Firefox for Android → Firefox Build System
Target Milestone: Firefox 58 → mozilla58
You need to log in before you can comment on or make changes to this bug.