Roll Android SDK to v20

BUG=393019
NOTRY=true

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283526 0039d316-1c4b-4281-b951-d872f2087c98

DEPS

@@ -512,7 +512,7 @@ deps_os = {
   "android": {
     "src/third_party/android_tools":
       Var("chromium_git") + "/android_tools.git" +
-      "@18728e9dd5dd66d4f5edf1b792e77e2b544a1cb0",
+      "@b36620e3a51939055ba871022123221a37ecdebb",
 
     "src/third_party/aosp":
       "/trunk/deps/third_party/aosp@148330",

build/android/pylib/constants.py

@@ -133,8 +133,8 @@ DEVICE_PERF_OUTPUT_DIR = (
 
 SCREENSHOTS_DIR = os.path.join(DIR_SOURCE_ROOT, 'out_screenshots')
 
-ANDROID_SDK_VERSION = 19
-ANDROID_SDK_BUILD_TOOLS_VERSION = '19.0.0'
+ANDROID_SDK_VERSION = 20
+ANDROID_SDK_BUILD_TOOLS_VERSION = '20.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,

build/common.gypi

@@ -1623,7 +1623,7 @@
             'android_sdk_root%': '<!(cd <(DEPTH) && pwd -P)/third_party/android_tools/sdk/',
             'android_host_arch%': '<!(uname -m)',
             # Android API-level of the SDK used for compilation.
-            'android_sdk_version%': '19',
+            'android_sdk_version%': '20',
             'android_sdk_build_tools_version%': '20.0.0',
             'host_os%': "<!(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')",
           },

build/config/android/config.gni

@@ -10,7 +10,7 @@ if (is_android) {
     android_src = ""
 
     android_sdk_root = "//third_party/android_tools/sdk"
-    android_sdk_version = "19"
+    android_sdk_version = "20"
 
     # This is set when building the Android WebView inside the Android build
     # system, using the 'android' gyp backend. The WebView code is still built
@@ -57,7 +57,7 @@ if (is_android) {
   android_sdk = "${android_sdk_root}/platforms/android-${android_sdk_version}"
 
   android_sdk_tools = "${android_sdk_root}/tools"
-  android_sdk_build_tools = "${android_sdk_root}/build-tools/19.0.0"
+  android_sdk_build_tools = "${android_sdk_root}/build-tools/20.0.0"
 
   # Path to the SDK's android.jar
   android_sdk_jar = "$android_sdk/android.jar"