722042 - Remove macbuild/ and maemo/ from mobile/android/app/

Status: VERIFIED FIXED

(Firefox for Android Graveyard :: General, defect, P4)

Description

[Robert Kaiser]

When looking into the source of native Fennec, I discovered that mobile/android/app/ contains macbuild/ and maemo/ directories. Those are probably leftovers from forking the XUL version in the beginning, and we should get rid of those (as well as any other leftover of building for non-Android, I guess). We don't really support building this for anything else than Android, right?

Comment 1

[Chris Peterson [:cpeterson]]

Attachment: part-1-remove-maemo-code.patch

Part 1: Remove Maemo code from mobile/android.

In addition to removing Maemo files from mobile/android, I have removed Maemo #ifdefs from Android's Makefiles and package-manifest.in.

Comment 2

[Chris Peterson [:cpeterson]]

Attachment: part-2-remove-macbuild-code.patch

Part 2: Remove macbuild code from mobile/android.

Comment 3

[Chris Peterson [:cpeterson]]

Attachment: part-3-remove-android-ifdefs.patch

Part 3: Remove some redundant #ifdef ANDROID checks.

Comment 4

[Chris Peterson [:cpeterson]]

Attachment: part-4-remove-qt-code.patch

Part 4: Remove Qt code from mobile/android.

Comment 5

[Chris Peterson [:cpeterson]]

Attachment: part-5-remove-windows-code.patch

Part 5: Remove Windows code from mobile/android.

Comment 6

[Brad Lassey [:blassey] (use needinfo?)]

Comment on attachment 641106 [details] [diff] [review]
part-1-remove-maemo-code.patch

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

::: mobile/android/app/mobile.js
@@ +415,5 @@
>  pref("dom.ipc.plugins.enabled", false);
>  #else
>  pref("plugin.disable", true);
>  pref("dom.ipc.plugins.enabled", true);
>  #endif

just remove the else (haven't looked at the other patches yet, if this is there than disregard)

@@ +429,1 @@
>  pref("dom.ipc.content.nice", 1);

this can just be removed (e10s only)

@@ +553,3 @@
>  pref("layers.acceleration.disabled", false);
>  #else
>  pref("layers.acceleration.disabled", true);

again, remove the else block unless its in a later patch

::: mobile/android/components/build/nsShellService.cpp
@@ +26,5 @@
>        window->showMinimized();
>    return NS_OK;
>  #else
>    return NS_ERROR_NOT_IMPLEMENTED;
>  #endif

I'm assuming this is removed in the qt patch

::: mobile/android/themes/core/defines.inc
@@ +123,4 @@
>  %define orientation -moz-device-orientation
>  %else
>  %define orientation orientation
>  %endif

again as above

Comment 7

[Chris Peterson [:cpeterson]]

Successful try build results:
https://tbpl.mozilla.org/?tree=Try&rev=91dfe18e33f9

Comment 8

[Chris Peterson [:cpeterson]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/a256dd9f427b
https://hg.mozilla.org/integration/mozilla-inbound/rev/af680b1b0d4d
https://hg.mozilla.org/integration/mozilla-inbound/rev/8a841a175bdc
https://hg.mozilla.org/integration/mozilla-inbound/rev/0e557485ecd8
https://hg.mozilla.org/integration/mozilla-inbound/rev/6600c32aa5f0

Comment 9

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/a256dd9f427b
https://hg.mozilla.org/mozilla-central/rev/af680b1b0d4d
https://hg.mozilla.org/mozilla-central/rev/8a841a175bdc
https://hg.mozilla.org/mozilla-central/rev/0e557485ecd8
https://hg.mozilla.org/mozilla-central/rev/6600c32aa5f0

Comment 10

[Cristian Nicolae (:xti)]

Code was removed for Firefox 16 Beta 5. Setting flag to verified.