1276043 - Don't put things other than macro definitions in android.m4

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Chris Manchester (limited bugmail, email directly)]

The only instance of this I see so far is in android.m4. I found this when removing a file containing macros, and noticing a random android related variable was un-set by that change.

So if I run configure on central, I get:

$ ./mach python -c "import buildconfig; print(buildconfig.substs.get('ANDROID_SUPPORT_LIBRARY_VERSION'))"
23.0.1

...but if I move the include of android.m4 from line 25 to line 19 of aclocal.m4 and then run configure I get:

$ ./mach python -c "import buildconfig; print(buildconfig.substs.get('ANDROID_SUPPORT_LIBRARY_VERSION'))"


Looking at the beginning of the generated old-configure in each case, it appears truncated in the latter.

Comment 1

[Mike Hommey [:glandium]]

Oversight on my part in the review for bug 1274955.

Comment 2

[Chris Manchester (limited bugmail, email directly)]

Attachment: MozReview Request: Bug 1276043 - Move ANDROID_SUPPORT_LIBRARY_VERSION and ADNROID_GOOGLE_PLAY_SERVICES_VERSION to Python configure. r=glandium

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

Comment 3

[Mike Hommey [:glandium]]

Comment on attachment 8757369 [details]
MozReview Request: Bug 1276043 - Move ANDROID_SUPPORT_LIBRARY_VERSION and ADNROID_GOOGLE_PLAY_SERVICES_VERSION to Python configure. r=glandium

https://reviewboard.mozilla.org/r/55834/#review53046

::: mobile/android/moz.configure:59
(Diff revision 1)
> +@depends('--help')
> +def support_library_version(_):
> +    return "23.0.1"
> +

It seems to me we can live with the literal string repeated between set_config and add_old_configure_assignment until android.m4 is removed.

Comment 4

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/mozilla-inbound/rev/156af424bc8e
Move ANDROID_SUPPORT_LIBRARY_VERSION and ADNROID_GOOGLE_PLAY_SERVICES_VERSION to Python configure. r=glandium

Comment 5

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/156af424bc8e