Factor out preprocessed Java into a separate library

RESOLVED FIXED in Firefox 36

Status

()

defect
RESOLVED FIXED
5 years ago
4 years ago

People

(Reporter: nalexander, Assigned: nalexander)

Tracking

Trunk
Firefox 36
All
Android
Points:
---
Dependency tree / graph

Firefox Tracking Flags

(Not tracked)

Details

Attachments

(6 attachments, 1 obsolete attachment)

At the moment, generated Java includes both preprocessed Java and aapt-generated Java.

IDEs never want our aapt-generated Java: Eclipse, IntelliJ, and other build systems like buck all arrange to get R.java (and Manifest.java) in slightly different ways.  Let's make this easier by splitting preprocessed and aapt-generated source.

Further, buck makes it difficult to mix Java in the srcdir and objdir.  The buck way to do this is mix Java libraries (JAR files) in the srcdir and objdir.

This ticket tracks splitting the sources and separating the generated sources into a tiny library independent of the main Fennec sources.
Attachment #8526375 - Flags: review?(rnewman)
/r/849 - Bug 1102488 - Pre: Remove unused cruft. r=rnewman
/r/851 - Bug 1102488 - Part 1: Factor out constants JAR. r=rnewman
/r/853 - Bug 1102488 - Part 2a: Move GeckoLoader.
/r/855 - Bug 1102488 - Part 2b: Don't preprocess GeckoLoader.
/r/857 - Bug 1102488 - Part 3: Output preprocessed files into generated/preprocessed. r=rnewman
/r/859 - Bug 1102488 - Part 4: Make FxAccountConstants independent of Logger. r=rnewman

Pull down these commits:

hg pull review -r d4bc85c5c958781acef3ecb8e0041877af45b3d0
https://reviewboard.mozilla.org/r/851/#review405

::: mobile/android/base/SysInfo.java.in
(Diff revision 1)
> +    private static volatile int sTotalRAM = -1;

Inclined to fix this to totalRAM while we're here.

::: mobile/android/base/moz.build
(Diff revision 1)
> +    'org/mozilla/gecko/SysInfo.java',

I slightly question SysInfo's presence in 'constants', but fair enough.
/r/849 - Bug 1102488 - Pre: Remove unused cruft. r=rnewman
/r/851 - Bug 1102488 - Part 1: Factor out constants JAR. r=rnewman
/r/853 - Bug 1102488 - Part 2a: Move GeckoLoader.
/r/855 - Bug 1102488 - Part 2b: Don't preprocess GeckoLoader.
/r/857 - Bug 1102488 - Part 3: Output preprocessed files into generated/preprocessed. r=rnewman
/r/859 - Bug 1102488 - Part 4: Make FxAccountConstants independent of Logger. r=rnewman

Pull down these commits:

hg pull review -r d4bc85c5c958781acef3ecb8e0041877af45b3d0
https://reviewboard.mozilla.org/r/857/#review413

::: mobile/android/base/fxa/FxAccountConstants.java.in
(Diff revision 1)
> -    }
> +    // }

Ahem?
/r/849 - Bug 1102488 - Pre: Remove unused cruft. r=rnewman
/r/851 - Bug 1102488 - Part 1: Factor out constants JAR. r=rnewman
/r/853 - Bug 1102488 - Part 2a: Move GeckoLoader.
/r/855 - Bug 1102488 - Part 2b: Don't preprocess GeckoLoader.
/r/857 - Bug 1102488 - Part 3: Output preprocessed files into generated/preprocessed. r=rnewman
/r/859 - Bug 1102488 - Part 4: Make FxAccountConstants independent of Logger. r=rnewman

Pull down these commits:

hg pull review -r d4bc85c5c958781acef3ecb8e0041877af45b3d0
https://reviewboard.mozilla.org/r/859/#review415

Fine if you fold in the // from the previous patch.
This was reviewed by rnewman over in https://reviewboard.mozilla.org/rbmozui/commits/847/ and friends.  Pushed in a different order with nits.
Attachment #8526375 - Flags: review?(rnewman) → review+
And a CLOBBER touch because random Android bustage isn't any fun.
https://hg.mozilla.org/integration/fx-team/rev/80199b6d7ee3
Flags: needinfo?(nalexander)
Attachment #8526375 - Attachment is obsolete: true
Attachment #8618664 - Flags: review+
Attachment #8618665 - Flags: review+
Attachment #8618666 - Flags: review+
Attachment #8618667 - Flags: review+
Attachment #8618668 - Flags: review+
Attachment #8618669 - Flags: review+
You need to log in before you can comment on or make changes to this bug.