Roll Android SDK to N-MR1

build/android/pylib/constants/__init__.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Defines a set of constants shared by test runners and other scripts."""
 
 # TODO(jbudorick): Split these constants into coherent modules.
 
 # pylint: disable=W0212
 
@@ skipping 78 matching lines @@
 ADB_KEYS_FILE = '/data/misc/adb/adb_keys'
 
 PERF_OUTPUT_DIR = os.path.join(DIR_SOURCE_ROOT, 'out', 'step_results')
 # The directory on the device where perf test output gets saved to.
 DEVICE_PERF_OUTPUT_DIR = (
     '/data/data/' + PACKAGE_INFO['chrome'].package + '/files')
 
 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,
                                  'build-tools', ANDROID_SDK_BUILD_TOOLS_VERSION)
 ANDROID_NDK_ROOT = os.path.join(DIR_SOURCE_ROOT,
                                 'third_party', 'android_tools', 'ndk')
 
 PROGUARD_SCRIPT_PATH = os.path.join(
     ANDROID_SDK_ROOT, 'tools', 'proguard', 'bin', 'proguard.sh')
 
@@ skipping 106 matching lines @@
 # remove this.
 def GetAdbPath():
   from devil.android.sdk import adb_wrapper
   return adb_wrapper.AdbWrapper.GetAdbPath()
 
 
 # Exit codes
 ERROR_EXIT_CODE = exit_codes.ERROR
 INFRA_EXIT_CODE = exit_codes.INFRA
 WARNING_EXIT_CODE = exit_codes.WARNING