1280600 - Cleanup Android/B2G configure and build scripts

Status: RESOLVED FIXED

(Firefox OS Graveyard :: GonkIntegration, defect)

Description

[Thomas Zimmermann [:tzimmermann] [:tdz]]

With bug 1276927 landed, b2g is much closer to Android than before. A number of configure and build scripts can now be cleaned up.

Comment 1

[Thomas Zimmermann [:tzimmermann] [:tdz]]

https://treeherder.mozilla.org/#/jobs?repo=try&revision=696bc329a9c4

Comment 2

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Attachment: Github pull request for gonk-misc

Comment 3

[Thomas Zimmermann [:tzimmermann] [:tdz]]

https://treeherder.mozilla.org/#/jobs?repo=try&revision=830070f03b10

Comment 4

[Thomas Zimmermann [:tzimmermann] [:tdz]]

https://treeherder.mozilla.org/#/jobs?repo=try&revision=c5cb41aadc79

Comment 5

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Attachment: Bug 1280600: Cleanup Bluetooth config and build scripts,

Bluetooth availability depends on available driver; not the base system's
version. This patch separates both. Following other modules, it also moves
search-path setup for BT header files into the affected moz.build scripts.

Review commit: https://reviewboard.mozilla.org/r/59920/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/59920/

Comment 6

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Attachment: Bug 1280600: Remove mDNS include search paths from configure script,

Necko's build scripts already handle include search paths for mDNS
libraries on b2g. This patch removes similar code from the configure
script.

Review commit: https://reviewboard.mozilla.org/r/59922/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/59922/

Comment 7

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Attachment: Bug 1280600: Replace 'GONK_INCLUDES' with 'CPPFLAGS',

Configure's 'GONK_INCLUDES' is just 'CPPFLAGS' with a differrent name. Use
'CPPFLAGS' instead.

Review commit: https://reviewboard.mozilla.org/r/59924/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/59924/

Comment 8

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Attachment: Bug 1280600: Cleanup Android-version variables in configure scripts,

Not all Android releases come with their own platform release. This patch adds
a switch statement to MOZ_ANDROID_NDK to use the previous platform release in
this case.

For several tests, the autoconf script 'old-configure.in' uses an internal
variable 'ANDROID_VERSION'. The stored value comes from the environment
variable 'PLATFORM_SDK_VERSION'. This patch replaces 'ANDROID_VERSION' by
'android_version', which is defined by MOZ_ANDROID_NDK from a command-line
parameter.

Review commit: https://reviewboard.mozilla.org/r/59926/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/59926/

Comment 9

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Attachment: Bug 1280600: Cleanup Android linker flags and libraries,

Android and b2g have duplicated linker flags and libraries. This patch
removes the duplicates from b2g scripts. The library 'log' is now listed
in the correct variable 'LIBS'.

Review commit: https://reviewboard.mozilla.org/r/59928/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/59928/

Comment 10

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Attachment: Bug 1280600: Merge Android and b2g branches in build scripts where possible,

B2g now has 'OS_TARGET' set to 'Android'. This patch merges Android
and Gonk branches in the build scripts where possible.

Review commit: https://reviewboard.mozilla.org/r/59930/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/59930/

Comment 11

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Attachment: Bug 1280600: Use Gecko's 'libgabi++' on b2g,

B2g came with its own version of 'libgabi++' in its toolchain. Gecko
on b2g isn't build any longer with this toolchain. With this patch
applied, Gecko's internal version of 'libgabi++' is used for building.

Review commit: https://reviewboard.mozilla.org/r/59932/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/59932/

Comment 12

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Comment on attachment 8763213 [details] [review]
Github pull request for gonk-misc

Patch [04] moves this code into the configure scripts.

Comment 13

[Mike Hommey [:glandium]]

Comment on attachment 8763801 [details]
Bug 1280600: Cleanup Bluetooth config and build scripts,

https://reviewboard.mozilla.org/r/59920/#review57756

Comment 14

[Mike Hommey [:glandium]]

Comment on attachment 8763802 [details]
Bug 1280600: Remove mDNS include search paths from configure script,

https://reviewboard.mozilla.org/r/59922/#review57758

Comment 15

[Mike Hommey [:glandium]]

Comment on attachment 8763803 [details]
Bug 1280600: Replace 'GONK_INCLUDES' with 'CPPFLAGS',

https://reviewboard.mozilla.org/r/59924/#review57760

Comment 16

[Mike Hommey [:glandium]]

Comment on attachment 8763804 [details]
Bug 1280600: Cleanup Android-version variables in configure scripts,

https://reviewboard.mozilla.org/r/59926/#review57762

::: build/autoconf/android.m4:49
(Diff revision 1)
> +    case $android_version in
> +    11|10)
> +        android_platform_version=9
> +        ;;
> +    20)
> +        android_platform_version=20

There must be an error here, as the number is the same.

Comment 17

[Mike Hommey [:glandium]]

Comment on attachment 8763805 [details]
Bug 1280600: Cleanup Android linker flags and libraries,

https://reviewboard.mozilla.org/r/59928/#review57764

Comment 18

[Mike Hommey [:glandium]]

Comment on attachment 8763806 [details]
Bug 1280600: Merge Android and b2g branches in build scripts where possible,

https://reviewboard.mozilla.org/r/59930/#review57768

::: netwerk/base/moz.build:290
(Diff revision 1)
>  elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
>      SOURCES += [
>          'NetworkInfoServiceCocoa.cpp',
>          'nsNetworkInfoService.cpp',
>      ]
> -elif CONFIG['OS_TARGET'] == 'Linux':
> +elif CONFIG['OS_TARGET'] in ('Android', 'Linux'):

CONFIG['OS_ARCH'] == 'Linux' matches for desktop linux, gonk, and android.

Comment 19

[Mike Hommey [:glandium]]

Comment on attachment 8763807 [details]
Bug 1280600: Use Gecko's 'libgabi++' on b2g,

https://reviewboard.mozilla.org/r/59932/#review57770

Comment 20

[Thomas Zimmermann [:tzimmermann] [:tdz]]

(In reply to Mike Hommey [:glandium] from comment #16)
> > +    20)
> > +        android_platform_version=20
> 
> There must be an error here, as the number is the same.

Right. That's supposed to be platform version 19.

Comment 21

[Thomas Zimmermann [:tzimmermann] [:tdz]]

(In reply to Mike Hommey [:glandium] from comment #18)
> > -elif CONFIG['OS_TARGET'] == 'Linux':
> > +elif CONFIG['OS_TARGET'] in ('Android', 'Linux'):
> 
> CONFIG['OS_ARCH'] == 'Linux' matches for desktop linux, gonk, and android.

Changed this to test for 'OS_ARCH'.

Comment 22

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Comment on attachment 8763801 [details]
Bug 1280600: Cleanup Bluetooth config and build scripts,

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/59920/diff/1-2/

Comment 23

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Comment on attachment 8763802 [details]
Bug 1280600: Remove mDNS include search paths from configure script,

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/59922/diff/1-2/

Comment 24

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Comment on attachment 8763803 [details]
Bug 1280600: Replace 'GONK_INCLUDES' with 'CPPFLAGS',

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/59924/diff/1-2/

Comment 25

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Comment on attachment 8763804 [details]
Bug 1280600: Cleanup Android-version variables in configure scripts,

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/59926/diff/1-2/

Comment 26

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Comment on attachment 8763805 [details]
Bug 1280600: Cleanup Android linker flags and libraries,

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/59928/diff/1-2/

Comment 27

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Comment on attachment 8763806 [details]
Bug 1280600: Merge Android and b2g branches in build scripts where possible,

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/59930/diff/1-2/

Comment 28

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Comment on attachment 8763807 [details]
Bug 1280600: Use Gecko's 'libgabi++' on b2g,

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/59932/diff/1-2/

Comment 29

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/mozilla-inbound/rev/6a50a446f04b
Cleanup Bluetooth config and build scripts, r=glandium
https://hg.mozilla.org/integration/mozilla-inbound/rev/72d9cc0b0287
Remove mDNS include search paths from configure script, r=glandium
https://hg.mozilla.org/integration/mozilla-inbound/rev/bc1b6ade02c5
Replace 'GONK_INCLUDES' with 'CPPFLAGS', r=glandium
https://hg.mozilla.org/integration/mozilla-inbound/rev/abb6ae66b2be
Cleanup Android-version variables in configure scripts, r=glandium
https://hg.mozilla.org/integration/mozilla-inbound/rev/ee3287e048f4
Cleanup Android linker flags and libraries, r=glandium
https://hg.mozilla.org/integration/mozilla-inbound/rev/fea9d890076e
Merge Android and b2g branches in build scripts where possible, r=glandium
https://hg.mozilla.org/integration/mozilla-inbound/rev/67352c9ced46
Use Gecko's 'libgabi++' on b2g, r=glandium

Comment 30

[Thomas Zimmermann [:tzimmermann] [:tdz]]

https://treeherder.mozilla.org/#/jobs?repo=mozilla-inbound&revision=67352c9ced46

Comment 31

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/mozilla-central/rev/6a50a446f04b
https://hg.mozilla.org/mozilla-central/rev/72d9cc0b0287
https://hg.mozilla.org/mozilla-central/rev/bc1b6ade02c5
https://hg.mozilla.org/mozilla-central/rev/abb6ae66b2be
https://hg.mozilla.org/mozilla-central/rev/ee3287e048f4
https://hg.mozilla.org/mozilla-central/rev/fea9d890076e
https://hg.mozilla.org/mozilla-central/rev/67352c9ced46

Comment 32

[Thomas Zimmermann [:tzimmermann] [:tdz]]

https://github.com/mozilla-b2g/gonk-misc/commit/1ec02eda4b375778b3611ebb7fb186faf5f75bb0