Bug 1276043 - Move ANDROID_SUPPORT_LIBRARY_VERSION and ADNROID_GOOGLE_PLAY_SERVICES_VERSION to Python configure. r=glandium
MozReview-Commit-ID: 2UctER22IGt
--- a/build/autoconf/android.m4
+++ b/build/autoconf/android.m4
@@ -202,22 +202,16 @@ AC_DEFUN([MOZ_ANDROID_AAR],[
define([root], $MOZ_BUILD_ROOT/dist/exploded-aar/$1-$2/)
MOZ_ANDROID_AAR_COMPONENT(concat(local_aar_var, _LIB), concat(root, $1-$2-classes.jar), REQUIRED)
MOZ_ANDROID_AAR_COMPONENT(concat(local_aar_var, _RES), concat(root, res), REQUIRED)
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_SUBST(ANDROID_SUPPORT_LIBRARY_VERSION)
-
-ANDROID_GOOGLE_PLAY_SERVICES_VERSION="8.4.0"
-AC_SUBST(ANDROID_GOOGLE_PLAY_SERVICES_VERSION)
-
AC_DEFUN([MOZ_ANDROID_GOOGLE_PLAY_SERVICES],
[
if test -n "$MOZ_NATIVE_DEVICES" ; then
AC_SUBST(MOZ_NATIVE_DEVICES)
MOZ_ANDROID_AAR(play-services-base, $ANDROID_GOOGLE_PLAY_SERVICES_VERSION, google, com/google/android/gms)
MOZ_ANDROID_AAR(play-services-basement, $ANDROID_GOOGLE_PLAY_SERVICES_VERSION, google, com/google/android/gms)
--- a/mobile/android/moz.configure
+++ b/mobile/android/moz.configure
@@ -51,16 +51,22 @@ android_apz = depends_if('--disable-andr
set_config('MOZ_ANDROID_APZ', android_apz)
set_define('MOZ_ANDROID_APZ', android_apz)
imply_option('MOZ_SOCIAL', False)
imply_option('MOZ_SERVICES_HEALTHREPORT', True)
imply_option('MOZ_ANDROID_HISTORY', True)
+set_config('ANDROID_SUPPORT_LIBRARY_VERSION', '23.0.1')
+add_old_configure_assignment('ANDROID_SUPPORT_LIBRARY_VERSION', '23.0.1')
+
+set_config('ANDROID_GOOGLE_PLAY_SERVICES_VERSION', '8.4.0')
+add_old_configure_assignment('ANDROID_GOOGLE_PLAY_SERVICES_VERSION', '8.4.0')
+
@depends(target)
def check_target(target):
if target.os != 'Android':
log.error('You must specify --target=arm-linux-androideabi (or some '
'other valid Android target) when building mobile/android.')
die('See https://developer.mozilla.org/docs/Mozilla/Developer_guide/'
'Build_Instructions/Simple_Firefox_for_Android_build '
'for more information about the necessary options.')