850487 - More code cleanup (@Overrides and unused imports)

Status: RESOLVED FIXED

(Firefox for Android Graveyard :: General, defect)

Description

[Brian Nicholson (:bnicholson)]

Bug 845618 and bug 845612 didn't include preprocessed files. Since I have Eclipse working with preprocessed files, we can fix these up too.

Comment 1

[Brian Nicholson (:bnicholson)]

Attachment: More code cleanup (@Overrides and unused imports)

Comment 2

[Kartikaya Gupta (email:[e-mail])]

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.

Comment 3

[Brian Nicholson (:bnicholson)]

https://hg.mozilla.org/integration/mozilla-inbound/rev/c9bbfe4c72ff

Comment 4

[Ed Morley [:emorley]]

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

Comment 5

[Robert O'Callahan (:roc) (email my personal email if necessary)]

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.

Comment 6

[Robert O'Callahan (:roc) (email my personal email if necessary)]

4) Avoid relying on imports at all inside #ifdefs.

Comment 7

[Robert O'Callahan (:roc) (email my personal email if necessary)]

Attachment: fix imports

Comment 8

[Brian Nicholson (:bnicholson)]

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).

Comment 9

[Robert O'Callahan (:roc) (email my personal email if necessary)]

https://hg.mozilla.org/integration/mozilla-inbound/rev/4a57008543aa

Comment 10

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/4a57008543aa