1052889 - Make Android Eclipse generate R.java

Status: RESOLVED FIXED

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

Description

[Nick Alexander :nalexander [he/him]]

Currently, the org.mozilla.gecko.R class is generated by aapt as part of the moz.build system into $OBJDIR/m/a/b/generated/org/mozilla/gecko/R.java.  This file is then compiled by Eclipse.  (Eclipse generates other dummy R.java files that are more or less empty, that do get compiled, and that are ignored.)

This leads to subtle interactions between Eclipse's APK builder and the moz.build aapt invocation.  I've personally witnessed difficult to diagnose errors based on the order of additional resource directories (-S flags to aapt).

It would be better to have Eclipse do the R.java generation itself.

Comment 1

[Nick Alexander :nalexander [he/him]]

Attachment: Make Android Eclipse generate R.java. r=bnicholson

This patch does two things.  First, it adds the Search Activity sources
to the main Fennec Eclipse project (when enabled).  There's no reason
for a separate project for these, since they are built as part of the
main Fennec package by moz.build.

Second, it arranges for Eclipse to generate the R.java and Manifest.java
files for all Android libraries and ignores the files generated by
moz.build.  (The relevant classes are org.mozilla.{gecko,search}.R.)
This means renaming the FennecResources Eclipse project's package to
org.mozilla.gecko, and renaming the FennecResourcesSearch project's
package to org.mozilla.search.  To be consistent, I switched
org.mozilla.fennec.resources to org.mozilla.gecko throughout.

Comment 2

[Nick Alexander :nalexander [he/him]]

Attachment: Make Android Eclipse generate R.java. r=bnicholson

This patch does two things.  First, it adds the Search Activity sources
to the main Fennec Eclipse project (when enabled).  There's no reason
for a separate project for these, since they are built as part of the
main Fennec package by moz.build.

Second, it arranges for Eclipse to generate the R.java and Manifest.java
files for all Android libraries and ignores the files generated by
moz.build.  (The relevant classes are org.mozilla.{gecko,search}.R.)
This means renaming the FennecResources Eclipse project's package to
org.mozilla.gecko, and renaming the FennecResourcesSearch project's
package to org.mozilla.search.  To be consistent, I switched
org.mozilla.fennec.resources to org.mozilla.gecko throughout.

To accommodate the crash reporter resources, which depend on the static
and generated resources, I added a layer of indirection. By moving the
main resources into project FennecResourcesStatic, we can have (reading
indentation as "depends on"):

FennecResources
  FennecResourcesCrashReporter
    FennecResourcesStatic
    FennecResourcesGenerated
  FennecResourcesBranding

This lets us break the bidirectional dependency between FennecResources
and FennecResourcesCrashReporter.

Comment 3

[Brian Nicholson (:bnicholson)]

Comment on attachment 8472390 [details] [diff] [review]
Make Android Eclipse generate R.java. r=bnicholson

Review of attachment 8472390 [details] [diff] [review]:
-----------------------------------------------------------------

\o/

Comment 4

[Nick Alexander :nalexander [he/him]]

https://hg.mozilla.org/integration/fx-team/rev/ebba69aab4e2

Comment 5

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/ebba69aab4e2