Backed out changeset 0183f1bb4655 (bug 1247047) for Android build bustage. r=backout on a CLOSED TREE
authorSebastian Hengst <archaeopteryx@coole-files.de>
Wed, 25 May 2016 18:32:42 +0200
changeset 338070 7b972fe5e8e38c1fa21fe9ad1eaf6e1566dc7370
parent 338069 dd01a65a8a920b355ca4488ccf0eb03c5a99e40b
child 338071 3531b8206f7051e2286f860e2c449bb5ff7f4a4c
push id6249
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 13:59:36 +0000
treeherdermozilla-beta@bad9d4f5bf7e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1247047
milestone49.0a1
backs out0183f1bb4655f70a64262749b9991ba7ef0cda8b
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 0183f1bb4655 (bug 1247047) for Android build bustage. r=backout on a CLOSED TREE
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.4.0"
+ANDROID_GOOGLE_PLAY_SERVICES_VERSION="8.1.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
@@ -2898,17 +2898,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.3)
+        MOZ_ANDROID_SDK(23, 23.0.1)
         ;;
     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.3'
+ANDROID_BUILD_TOOLS_VERSION = '23.0.1'
 
 # 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,