Bug 1210755 - Mach build: Compile with SDK version 23 and use build tools 23.0.1. r=nalexander
authorSebastian Kaspari <s.kaspari@gmail.com>
Mon, 05 Oct 2015 15:01:23 +0200
changeset 298796 a51020a4a9c2e0961422e2ec5cc9b977f1e844ca
parent 298795 4fc76c1023754e9bf961be151f532c044035f5d3
child 298797 88829b86c9ebc235d719f991352350d845127151
push id6119
push usercliu@mozilla.com
push dateMon, 05 Oct 2015 18:41:22 +0000
reviewersnalexander
bugs1210755
milestone44.0a1
Bug 1210755 - Mach build: Compile with SDK version 23 and use build tools 23.0.1. r=nalexander
configure.in
python/mozboot/mozboot/android.py
--- a/configure.in
+++ b/configure.in
@@ -4090,17 +4090,17 @@ if test -z "$gonkdir" ; then
             :
             ;;
         *)
             AC_MSG_ERROR([You must specify --target=arm-linux-androideabi (or some other valid android target) when building with --enable-application=mobile/android or --enable-application=mobile/android/b2gdroid.
              See https://wiki.mozilla.org/Mobile/Fennec/Android#Setup_Fennec_mozconfig for more information about the necessary options])
             ;;
         esac
 
-        MOZ_ANDROID_SDK(22, 22.0.1)
+        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
@@ -9,18 +9,18 @@ import errno
 import os
 import stat
 import subprocess
 
 
 # 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 = '22'
-ANDROID_BUILD_TOOLS_VERSION = '22.0.1'
+ANDROID_TARGET_SDK = '23'
+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-preview', # Temporarily, tools depends on platform-tools-preview.
     'build-tools-%s' % ANDROID_BUILD_TOOLS_VERSION,
     'android-%s' % ANDROID_TARGET_SDK,