Bug 1247047 - Update build tools to 23.0.3 and Google Play Services to 8.4.0. r=ahunt
authorSebastian Kaspari <s.kaspari@gmail.com>
Mon, 23 May 2016 17:46:06 +0200
changeset 299333 42f95268a3210bc372c55cdc94fdae081544aa1a
parent 299332 e0354aa795ba11ec139cbe286e7217ba4fd0ad3e
child 299334 77700ecdd9ebd10fbe93a093aeb9ce564e4655de
push id19427
push users.kaspari@gmail.com
push dateMon, 30 May 2016 08:13:01 +0000
treeherderfx-team@be56cb9803a9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersahunt
bugs1247047
milestone49.0a1
Bug 1247047 - Update build tools to 23.0.3 and Google Play Services to 8.4.0. r=ahunt MozReview-Commit-ID: 3KZfrc4SL2D
build/autoconf/android.m4
old-configure.in
python/mozboot/mozboot/android.py
--- a/build/autoconf/android.m4
+++ b/build/autoconf/android.m4
@@ -205,17 +205,17 @@ AC_DEFUN([MOZ_ANDROID_AAR],[
   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.1.0"
+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)
 
--- a/old-configure.in
+++ b/old-configure.in
@@ -2887,17 +2887,17 @@ AC_SUBST(MOZ_B2G_VERSION)
 dnl ========================================================
 dnl Ensure Android SDK and build-tools versions depending on
 dnl mobile target.
 dnl ========================================================
 
 if test -z "$gonkdir" ; then
     case "$MOZ_BUILD_APP" in
     mobile/android)
-        MOZ_ANDROID_SDK(23, 23.0.1)
+        MOZ_ANDROID_SDK(23, 23.0.3)
         ;;
     esac
 fi
 
 dnl ========================================================
 dnl =
 dnl = Toolkit Options
 dnl =
--- a/python/mozboot/mozboot/android.py
+++ b/python/mozboot/mozboot/android.py
@@ -10,17 +10,17 @@ import os
 import stat
 import subprocess
 import sys
 
 # These are the platform and build-tools versions for building
 # mobile/android, respectively. Try to keep these in synch with the
 # build system and Mozilla's automation.
 ANDROID_TARGET_SDK = '23'
-ANDROID_BUILD_TOOLS_VERSION = '23.0.1'
+ANDROID_BUILD_TOOLS_VERSION = '23.0.3'
 
 # These are the "Android packages" needed for building Firefox for Android.
 # Use |android list sdk --extended| to see these identifiers.
 ANDROID_PACKAGES = [
     'tools',
     'platform-tools',
     'build-tools-%s' % ANDROID_BUILD_TOOLS_VERSION,
     'android-%s' % ANDROID_TARGET_SDK,