Closed
Bug 1280600
Opened 9 years ago
Closed 9 years ago
Cleanup Android/B2G configure and build scripts
Categories
(Firefox OS Graveyard :: GonkIntegration, defect)
Tracking
(firefox50 fixed)
RESOLVED
FIXED
Tracking | Status | |
---|---|---|
firefox50 | --- | fixed |
People
(Reporter: tzimmermann, Assigned: tzimmermann)
References
Details
Attachments
(8 files)
49 bytes,
text/x-github-pull-request
|
gerard-majax
:
review+
|
Details | Review |
58 bytes,
text/x-review-board-request
|
glandium
:
review+
|
Details |
58 bytes,
text/x-review-board-request
|
glandium
:
review+
|
Details |
58 bytes,
text/x-review-board-request
|
glandium
:
review+
|
Details |
58 bytes,
text/x-review-board-request
|
glandium
:
review+
|
Details |
58 bytes,
text/x-review-board-request
|
glandium
:
review+
|
Details |
58 bytes,
text/x-review-board-request
|
glandium
:
review+
|
Details |
58 bytes,
text/x-review-board-request
|
glandium
:
review+
|
Details |
With bug 1276927 landed, b2g is much closer to Android than before. A number of configure and build scripts can now be cleaned up.
Assignee | ||
Comment 1•9 years ago
|
||
Assignee | ||
Comment 2•9 years ago
|
||
Assignee | ||
Comment 3•9 years ago
|
||
Assignee | ||
Comment 4•9 years ago
|
||
Assignee | ||
Comment 5•9 years ago
|
||
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/
Attachment #8763801 -
Flags: review?(mh+mozilla)
Attachment #8763802 -
Flags: review?(mh+mozilla)
Attachment #8763803 -
Flags: review?(mh+mozilla)
Attachment #8763804 -
Flags: review?(mh+mozilla)
Attachment #8763805 -
Flags: review?(mh+mozilla)
Attachment #8763806 -
Flags: review?(mh+mozilla)
Attachment #8763807 -
Flags: review?(mh+mozilla)
Assignee | ||
Comment 6•9 years ago
|
||
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/
Assignee | ||
Comment 7•9 years ago
|
||
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/
Assignee | ||
Comment 8•9 years ago
|
||
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/
Assignee | ||
Comment 9•9 years ago
|
||
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/
Assignee | ||
Comment 10•9 years ago
|
||
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/
Assignee | ||
Comment 11•9 years ago
|
||
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/
Assignee | ||
Comment 12•9 years ago
|
||
Comment on attachment 8763213 [details] [review]
Github pull request for gonk-misc
Patch [04] moves this code into the configure scripts.
Attachment #8763213 -
Flags: review?(lissyx+mozillians)
Updated•9 years ago
|
Attachment #8763213 -
Flags: review?(lissyx+mozillians) → review+
Comment 13•9 years ago
|
||
Comment on attachment 8763801 [details]
Bug 1280600: Cleanup Bluetooth config and build scripts,
https://reviewboard.mozilla.org/r/59920/#review57756
Attachment #8763801 -
Flags: review?(mh+mozilla) → review+
Updated•9 years ago
|
Attachment #8763802 -
Flags: review?(mh+mozilla) → review+
Comment 14•9 years ago
|
||
Comment on attachment 8763802 [details]
Bug 1280600: Remove mDNS include search paths from configure script,
https://reviewboard.mozilla.org/r/59922/#review57758
Updated•9 years ago
|
Attachment #8763803 -
Flags: review?(mh+mozilla) → review+
Comment 15•9 years ago
|
||
Comment on attachment 8763803 [details]
Bug 1280600: Replace 'GONK_INCLUDES' with 'CPPFLAGS',
https://reviewboard.mozilla.org/r/59924/#review57760
Updated•9 years ago
|
Attachment #8763804 -
Flags: review?(mh+mozilla) → review+
Comment 16•9 years ago
|
||
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•9 years ago
|
||
Comment on attachment 8763805 [details]
Bug 1280600: Cleanup Android linker flags and libraries,
https://reviewboard.mozilla.org/r/59928/#review57764
Attachment #8763805 -
Flags: review?(mh+mozilla) → review+
Updated•9 years ago
|
Attachment #8763806 -
Flags: review?(mh+mozilla) → review+
Comment 18•9 years ago
|
||
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•9 years ago
|
||
Comment on attachment 8763807 [details]
Bug 1280600: Use Gecko's 'libgabi++' on b2g,
https://reviewboard.mozilla.org/r/59932/#review57770
Attachment #8763807 -
Flags: review?(mh+mozilla) → review+
Assignee | ||
Comment 20•9 years ago
|
||
(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.
Assignee | ||
Comment 21•9 years ago
|
||
(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'.
Assignee | ||
Comment 22•9 years ago
|
||
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/
Assignee | ||
Comment 23•9 years ago
|
||
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/
Assignee | ||
Comment 24•9 years ago
|
||
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/
Assignee | ||
Comment 25•9 years ago
|
||
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/
Assignee | ||
Comment 26•9 years ago
|
||
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/
Assignee | ||
Comment 27•9 years ago
|
||
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/
Assignee | ||
Comment 28•9 years ago
|
||
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•9 years ago
|
||
Pushed by tdz@users.sourceforge.net:
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
Assignee | ||
Comment 30•9 years ago
|
||
Comment 31•9 years ago
|
||
bugherder |
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
Assignee | ||
Comment 32•9 years ago
|
||
You need to log in
before you can comment on or make changes to this bug.
Description
•