From a8813db8ea78404ba79f53bdbe69bffadaa82e25 Mon Sep 17 00:00:00 2001
From: aurimas <aurimas@chromium.org>
Date: Thu, 12 Mar 2015 15:41:16 -0700
Subject: [PATCH] Roll Android SDK to API 22

Updated the following:
- Android SDK Platform API 22
- Android SDK Tools 24.1.2
- Android SDK Platform-tools 22
- Android SDK Build-tools 22
- Android SDK Sources 22
- Android Support Library 21.0.3

BUG=440601

Review URL: https://codereview.chromium.org/1000463002

Cr-Original-Commit-Position: refs/heads/master@{#320395}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: e2a21a01b60eb329e61499458f51ebae7a0951ad
---
 android/gyp/javac.py       | 3 ++-
 android/pylib/constants.py | 5 +++--
 common.gypi                | 4 ++--
 config/android/config.gni  | 4 ++--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/android/gyp/javac.py b/android/gyp/javac.py
index 37380629e..a0fcda815 100755
--- a/android/gyp/javac.py
+++ b/android/gyp/javac.py
@@ -80,7 +80,8 @@ def DoJavac(
       '-classpath', ':'.join(classpath),
       '-d', classes_dir]
   if chromium_code:
-    javac_args.extend(['-Xlint:unchecked', '-Xlint:deprecation'])
+    # TODO(aurimas): re-enable '-Xlint:deprecation' checks once they are fixed.
+    javac_args.extend(['-Xlint:unchecked'])
   else:
     # XDignore.symbol.file makes javac compile against rt.jar instead of
     # ct.sym. This means that using a java internal package/class will not
diff --git a/android/pylib/constants.py b/android/pylib/constants.py
index b849a8d9e..34dbf190a 100644
--- a/android/pylib/constants.py
+++ b/android/pylib/constants.py
@@ -167,9 +167,10 @@ class ANDROID_SDK_VERSION_CODES(object):
   KITKAT = 19
   KITKAT_WATCH = 20
   LOLLIPOP = 21
+  LOLLIPOP_MR1 = 22
 
-ANDROID_SDK_VERSION = ANDROID_SDK_VERSION_CODES.LOLLIPOP
-ANDROID_SDK_BUILD_TOOLS_VERSION = '21.0.1'
+ANDROID_SDK_VERSION = ANDROID_SDK_VERSION_CODES.LOLLIPOP_MR1
+ANDROID_SDK_BUILD_TOOLS_VERSION = '22.0.0'
 ANDROID_SDK_ROOT = os.path.join(DIR_SOURCE_ROOT,
                                 'third_party/android_tools/sdk')
 ANDROID_SDK_TOOLS = os.path.join(ANDROID_SDK_ROOT,
diff --git a/common.gypi b/common.gypi
index 4b97d977c..b07d90169 100644
--- a/common.gypi
+++ b/common.gypi
@@ -1681,8 +1681,8 @@
             'android_ndk_absolute_root%': '<!(cd <(DEPTH) && pwd -P)/third_party/android_tools/ndk/',
             'android_host_arch%': '<!(uname -m)',
             # Android API-level of the SDK used for compilation.
-            'android_sdk_version%': '21',
-            'android_sdk_build_tools_version%': '21.0.1',
+            'android_sdk_version%': '22',
+            'android_sdk_build_tools_version%': '22.0.0',
             'host_os%': "<!(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')",
           },
           # Copy conditionally-set variables out one scope.
diff --git a/config/android/config.gni b/config/android/config.gni
index cebf4de6b..5a27e78e6 100644
--- a/config/android/config.gni
+++ b/config/android/config.gni
@@ -16,8 +16,8 @@ if (is_android) {
 
   if (!defined(default_android_sdk_root)) {
     default_android_sdk_root = "//third_party/android_tools/sdk"
-    default_android_sdk_version = "21"
-    default_android_sdk_build_tools_version = "21.0.1"
+    default_android_sdk_version = "22"
+    default_android_sdk_build_tools_version = "22.0.0"
   }
 
   if (!defined(google_play_services_library)) {