1274955 - Extract Android dependency versions

Status: RESOLVED FIXED

(Firefox Build System :: Android Studio and Gradle Integration, defect)

Description

[Sebastian Kaspari (:sebastian; :pocmo)]

I want to land some pieces from bug 1247047 independently. This bug is about extracting the dependency versions.

Comment 1

[Sebastian Kaspari (:sebastian; :pocmo)]

Attachment: MozReview Request: Bug 1274955 - Extract Android dependency versions. r=glandium

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

Comment 2

[Sebastian Kaspari (:sebastian; :pocmo)]

Comment on attachment 8755395 [details]
MozReview Request: Bug 1274955 - Extract Android dependency versions. r=glandium

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

Comment 3

[Sebastian Kaspari (:sebastian; :pocmo)]

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

Comment 4

[Mike Hommey [:glandium]]

Comment on attachment 8755395 [details]
MozReview Request: Bug 1274955 - Extract Android dependency versions. r=glandium

https://reviewboard.mozilla.org/r/54596/#review51334

::: build.gradle:11
(Diff revision 2)
> +        buildToolsVersion = '23.0.1'
> +        googlePlayServicesVersion = '8.1.0'
> +        androidSupportLibraryVersion = '23.0.1'

there are ${variables} in build.gradle, that look like they come from the build system/configure. Can't these versions be pulled the same way?

Comment 5

[Sebastian Kaspari (:sebastian; :pocmo)]

Comment on attachment 8755395 [details]
MozReview Request: Bug 1274955 - Extract Android dependency versions. r=glandium

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

Comment 6

[Mike Hommey [:glandium]]

Comment on attachment 8755395 [details]
MozReview Request: Bug 1274955 - Extract Android dependency versions. r=glandium

https://reviewboard.mozilla.org/r/54596/#review51622

::: build/autoconf/android.m4:211
(Diff revision 3)
>    MOZ_ANDROID_AAR_COMPONENT(concat(local_aar_var, _INTERNAL_LIB), concat(root, libs/$1-$2-internal_impl-$2.jar), $5)
>    MOZ_ANDROID_AAR_COMPONENT(concat(local_aar_var, _ASSETS), concat(root, assets), $6)
>  ])
>  
> +ANDROID_SUPPORT_LIBRARY_VERSION="23.0.1"
> +AC_DEFINE_UNQUOTED(ANDROID_SUPPORT_LIBRARY_VERSION,$ANDROID_SUPPORT_LIBRARY_VERSION)

you don't need this

::: build/autoconf/android.m4:215
(Diff revision 3)
> +ANDROID_SUPPORT_LIBRARY_VERSION="23.0.1"
> +AC_DEFINE_UNQUOTED(ANDROID_SUPPORT_LIBRARY_VERSION,$ANDROID_SUPPORT_LIBRARY_VERSION)
> +AC_SUBST(ANDROID_SUPPORT_LIBRARY_VERSION)
> +
> +ANDROID_GOOGLE_PLAY_SERVICES_VERSION="8.1.0"
> +AC_DEFINE_UNQUOTED(ANDROID_GOOGLE_PLAY_SERVICES_VERSION,$ANDROID_GOOGLE_PLAY_SERVICES_VERSION)

Likewise

::: build/autoconf/android.m4:346
(Diff revision 3)
>      ANDROID_TARGET_SDK="${android_target_sdk}"
>      ANDROID_SDK="${android_sdk}"
>      ANDROID_SDK_ROOT="${android_sdk_root}"
>      ANDROID_TOOLS="${android_tools}"
> -    AC_DEFINE_UNQUOTED(ANDROID_TARGET_SDK,$ANDROID_TARGET_SDK)
> +    ANDROID_BUILD_TOOLS_VERSION="$2"
> +    AC_DEFINE_UNQUOTED(ANDROID_TARGET_SDK,$ANDROID_TARGET_SDK,ANDROID_BUILD_TOOLS_VERSION)

That doesn't seem required.

Comment 7

[Sebastian Kaspari (:sebastian; :pocmo)]

Comment on attachment 8755395 [details]
MozReview Request: Bug 1274955 - Extract Android dependency versions. r=glandium

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/54596/diff/3-4/

Comment 8

[Sebastian Kaspari (:sebastian; :pocmo)]

https://hg.mozilla.org/integration/fx-team/rev/6f87924204740088e96b5ae8e633963a90d5a359
Bug 1274955 - Extract Android dependency versions. r=glandium

Comment 9

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

https://hg.mozilla.org/mozilla-central/rev/6f8792420474