Closed Bug 850487 Opened 7 years ago Closed 7 years ago

More code cleanup (@Overrides and unused imports)

Categories

(Firefox for Android :: General, defect)

ARM
Android
defect
Not set

Tracking

()

RESOLVED FIXED
Firefox 22

People

(Reporter: bnicholson, Assigned: bnicholson)

Details

Attachments

(2 files)

Bug 845618 and bug 845612 didn't include preprocessed files. Since I have Eclipse working with preprocessed files, we can fix these up too.
Attachment #724203 - Flags: review?(bugmail.mozilla)
Comment on attachment 724203 [details] [diff] [review]
More code cleanup (@Overrides and unused imports)

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

I assume you tested this all still builds fine. r=me if that is the case.
Attachment #724203 - Flags: review?(bugmail.mozilla) → review+
https://hg.mozilla.org/mozilla-central/rev/c9bbfe4c72ff
Status: NEW → RESOLVED
Closed: 7 years ago
Resolution: --- → FIXED
Target Milestone: --- → Firefox 22
This patch broke builds with --enable-profiling. App.java.in and WebApp.java.in use GeckoEvent inside "#ifdef MOZ_PROFILING", and this patch removed the import. I guess the cleanup code you used ignores stuff inside #ifdefs. Frustratingly, I had previously fixed this in bug 786620 and this patch backed out my fix :-(.

Obvious options here:
1) Make Fennec builds fail at configure time if MOZ_PROFILING is enabled. Probably not the best fix.
2) Fix your tools to #define MOZ_PROFILING and any other relevant #ifdefs when you're looking for unused imports.
3) Reorganize the code so that this code isn't #ifdefed.
4) Avoid relying on imports at all inside #ifdefs.
Comment on attachment 730526 [details] [diff] [review]
fix imports

Sorry, and thanks!

We've been talking about moving preprocessed booleans to a single constants file to do all preprocessing in one place, so we will replace these #ifdefs with regular ifs (option 3).
Attachment #730526 - Flags: review?(bnicholson) → review+
You need to log in before you can comment on or make changes to this bug.