1433285 - Don't manually manage classes.dex when --with-gradle

Status: RESOLVED FIXED

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

Description

[Nick Alexander :nalexander [he/him]]

Right now, we maintain legacy manual classes.dex handling, even under --with-gradle.  That's not good for Bug 1414054 (which tracks adding support for multi-dex) and it's causing problems with Bug 1411654.

This ticket tracks extracting classes.dex from the Gradle-produced .ap_ at package time, avoiding the issue in https://bugzilla.mozilla.org/show_bug.cgi?id=1411654#c161.

Comment 1

[Nick Alexander :nalexander [he/him]]

Attachment: Bug 1433285: Extract classes*.dex from .ap_ --with-gradle.

Right now, we only expect classes.dex, and even --with-gradle we copy
it out of $topobjdir/mobile/android/base.  This commit changes that
for --with-gradle: we only take classes.dex from the given .ap_ file,
and we also handle multiple classesN.dex files (for future multi-dex
support).  The moz.build system stays the same.

This avoids an issue with newer Android-Gradle plugins, where the
classes.dex produced could be either in dex/ or in dexMerger/,
depending on whether any external libraries needed merging.  By
extracting classes.dex from the .ap_ file, we don't need to know what
Gradle build steps actually occur.

The classes.dex in the package-manifest.in has been irrelevant since
Bug 1260241.

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

Comment 2

[James Willcox (:snorp) ([e-mail]) (he/him)]

Comment on attachment 8945630 [details]
Bug 1433285: Extract classes*.dex from .ap_ --with-gradle.

https://reviewboard.mozilla.org/r/215762/#review221496

Comment 3

[Nick Alexander :nalexander [he/him]]

Comment on attachment 8945630 [details]
Bug 1433285: Extract classes*.dex from .ap_ --with-gradle.

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/215762/diff/1-2/

Comment 4

[Gregory Szorc [:gps]]

Comment on attachment 8945630 [details]
Bug 1433285: Extract classes*.dex from .ap_ --with-gradle.

https://reviewboard.mozilla.org/r/215762/#review222426

Comment 5

[Nick Alexander :nalexander [he/him]]

Comment on attachment 8945630 [details]
Bug 1433285: Extract classes*.dex from .ap_ --with-gradle.

https://reviewboard.mozilla.org/r/215762/#review222434

Comment 6

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/53fa60c5e8b4
Extract classes*.dex from .ap_ --with-gradle. r=gps,snorp

Comment 7

[Sebastian Hengst [:aryx] (needinfo on intermittent or backout)]

https://hg.mozilla.org/mozilla-central/rev/53fa60c5e8b4