From 7c263053681fd4e5297e2f69268587604123e1c0 Mon Sep 17 00:00:00 2001
From: mikecase <mikecase@chromium.org>
Date: Thu, 30 Mar 2017 16:46:11 -0700
Subject: [PATCH] Roll Android SDK to N-MR1

BUG=688263
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.android:android_cronet_tester

Review-Url: https://codereview.chromium.org/2760383003
Cr-Commit-Position: refs/heads/master@{#460934}
---
 DEPS                                      | 2 +-
 build/android/devil_chromium.json         | 6 +++---
 build/android/pylib/constants/__init__.py | 2 +-
 build/config/android/config.gni           | 6 +++---
 components/cronet/android/api/build.xml   | 2 +-
 docs/android_test_instructions.md         | 4 ++--
 tools/android/eclipse/.classpath          | 6 +++---
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/DEPS b/DEPS
index 542ace02ee815f..60142f1b00ee5a 100644
--- a/DEPS
+++ b/DEPS
@@ -464,7 +464,7 @@ deps_os = {
       Var('chromium_git') + '/external/android_protobuf.git' + '@' + '999188d0dc72e97f7fe08bb756958a2cf090f4e7',
 
     'src/third_party/android_tools':
-      Var('chromium_git') + '/android_tools.git' + '@' + 'b43a6a289a7588b1769814f04dd6c7d7176974cc',
+      Var('chromium_git') + '/android_tools.git' + '@' + 'b65c4776dac2cf1b80e969b3b2d4e081b9c84f29',
 
     'src/third_party/apache-portable-runtime/src':
       Var('chromium_git') + '/external/apache-portable-runtime.git' + '@' + 'c76a8c4277e09a82eaa229e35246edea1ee0a6a1',
diff --git a/build/android/devil_chromium.json b/build/android/devil_chromium.json
index 1f9080d115d975..6b87fa2c821671 100644
--- a/build/android/devil_chromium.json
+++ b/build/android/devil_chromium.json
@@ -5,7 +5,7 @@
       "file_info": {
         "linux2_x86_64": {
           "local_paths": [
-            "../../third_party/android_tools/sdk/build-tools/24.0.2/aapt"
+            "../../third_party/android_tools/sdk/build-tools/25.0.2/aapt"
           ]
         }
       }
@@ -32,7 +32,7 @@
       "file_info": {
         "linux2_x86_64": {
           "local_paths": [
-            "../../third_party/android_tools/sdk/build-tools/24.0.2/dexdump"
+            "../../third_party/android_tools/sdk/build-tools/25.0.2/dexdump"
           ]
         }
       }
@@ -41,7 +41,7 @@
       "file_info": {
         "linux2_x86_64": {
           "local_paths": [
-            "../../third_party/android_tools/sdk/build-tools/24.0.2/split-select"
+            "../../third_party/android_tools/sdk/build-tools/25.0.2/split-select"
           ]
         }
       }
diff --git a/build/android/pylib/constants/__init__.py b/build/android/pylib/constants/__init__.py
index 916ee275564a66..1187f696c17f14 100644
--- a/build/android/pylib/constants/__init__.py
+++ b/build/android/pylib/constants/__init__.py
@@ -96,7 +96,7 @@
 SCREENSHOTS_DIR = os.path.join(DIR_SOURCE_ROOT, 'out_screenshots')
 
 ANDROID_SDK_VERSION = version_codes.MARSHMALLOW
-ANDROID_SDK_BUILD_TOOLS_VERSION = '24.0.2'
+ANDROID_SDK_BUILD_TOOLS_VERSION = '25.0.2'
 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/build/config/android/config.gni b/build/config/android/config.gni
index a9ff7c46aded78..a88c9360eff887 100644
--- a/build/config/android/config.gni
+++ b/build/config/android/config.gni
@@ -43,15 +43,15 @@ if (is_android) {
 
   if (!defined(default_android_sdk_root)) {
     default_android_sdk_root = "//third_party/android_tools/sdk"
-    default_android_sdk_version = "24"
-    default_android_sdk_build_tools_version = "24.0.2"
+    default_android_sdk_version = "25"
+    default_android_sdk_build_tools_version = "25.0.2"
   }
 
   if (!defined(default_lint_android_sdk_root)) {
     # Purposefully repeated so that downstream can change
     # default_android_sdk_root without changing lint version.
     default_lint_android_sdk_root = "//third_party/android_tools/sdk"
-    default_lint_android_sdk_version = "24"
+    default_lint_android_sdk_version = "25"
   }
 
   if (!defined(default_extras_android_sdk_root)) {
diff --git a/components/cronet/android/api/build.xml b/components/cronet/android/api/build.xml
index 4eb2cc6245f2b9..fced897d7d9417 100644
--- a/components/cronet/android/api/build.xml
+++ b/components/cronet/android/api/build.xml
@@ -2,7 +2,7 @@
   <target name="doc" description="generate documentation">
       <javadoc destdir="${doc.dir}"
                overview="${overview}"
-               bootclasspath="../../../../third_party/android_tools/sdk/platforms/android-24/android.jar:../../../../third_party/android_tools/sdk/extras/android/support/annotations/android-support-annotations.jar:${lib.java.dir}/cronet_javadoc_classpath.jar"
+               bootclasspath="../../../../third_party/android_tools/sdk/platforms/android-25/android.jar:../../../../third_party/android_tools/sdk/extras/android/support/annotations/android-support-annotations.jar:${lib.java.dir}/cronet_javadoc_classpath.jar"
                docletpath="../../../../buildtools/android/doclava/jsilver.jar:../../../../buildtools/android/doclava/doclava.jar"
                >
         <fileset dir="${source.dir}">
diff --git a/docs/android_test_instructions.md b/docs/android_test_instructions.md
index b26130cc6f4780..b941118f416ed3 100644
--- a/docs/android_test_instructions.md
+++ b/docs/android_test_instructions.md
@@ -158,11 +158,11 @@ with the following commands:
 
 ```shell
 # Resize userdata partition to be 1G
-resize2fs android_emulator_sdk/sdk/system-images/android-24/x86/userdata.img 1G
+resize2fs android_emulator_sdk/sdk/system-images/android-25/x86/userdata.img 1G
 
 # Set filesystem parameter to continue on errors; Android doesn't like some
 # things e2fsprogs does.
-tune2fs -e continue android_emulator_sdk/sdk/system-images/android-24/x86/userdata.img
+tune2fs -e continue android_emulator_sdk/sdk/system-images/android-25/x86/userdata.img
 ```
 
 ## Symbolizing Crashes
diff --git a/tools/android/eclipse/.classpath b/tools/android/eclipse/.classpath
index 67d205a1b3ec3b..76587b861e25cd 100644
--- a/tools/android/eclipse/.classpath
+++ b/tools/android/eclipse/.classpath
@@ -216,13 +216,13 @@ to the classpath for downstream development. See "additional_entries" below.
     <classpathentry kind="src" path="out/Debug/java_proto/test_support_proto_java/src"/>
     <classpathentry kind="src" path="out/Debug/remoting_apk/gen"/>
     <classpathentry kind="lib" path="third_party/android_tools/sdk/extras/google/gcm/gcm-client/dist/gcm.jar" sourcepath="third_party/android_tools/sdk/extras/google/gcm/gcm-client/src"/>
-    <classpathentry kind="lib" path="third_party/android_tools/sdk/platforms/android-24/android.jar" sourcepath="third_party/android_tools/sdk/sources/">
+    <classpathentry kind="lib" path="third_party/android_tools/sdk/platforms/android-25/android.jar" sourcepath="third_party/android_tools/sdk/sources/">
         <attributes>
             <attribute name="javadoc_location" value="http://developer.android.com/reference/"/>
         </attributes>
     </classpathentry>
-    <classpathentry kind="lib" path="third_party/android_tools/sdk/platforms/android-24/data/layoutlib.jar" sourcepath="third_party/android_tools/sdk/sources/"/>
-    <classpathentry kind="lib" path="third_party/android_tools/sdk/platforms/android-24/uiautomator.jar" sourcepath="third_party/android_tools/sdk/sources"/>
+    <classpathentry kind="lib" path="third_party/android_tools/sdk/platforms/android-25/data/layoutlib.jar" sourcepath="third_party/android_tools/sdk/sources/"/>
+    <classpathentry kind="lib" path="third_party/android_tools/sdk/platforms/android-25/uiautomator.jar" sourcepath="third_party/android_tools/sdk/sources"/>
     <classpathentry kind="lib" path="third_party/android_tools/sdk/extras/android/support/design/libs/android-support-design.jar" sourcepath="third_party/android_tools/sdk/sources"/>
     <classpathentry kind="lib" path="third_party/android_tools/sdk/extras/android/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar" sourcepath="third_party/android_tools/sdk/sources"/>
     <classpathentry kind="lib" path="third_party/android_tools/sdk/extras/android/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar" sourcepath="third_party/android_tools/sdk/sources"/>