Roll android SDK to O MR1.

Bug: 782848
Cq-Include-Trybots: master.tryserver.chromium.android:android_cronet_tester;master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: I49f3bf6cf68a9d6d5771d5715d65c742bdbb03a3
Reviewed-on: https://chromium-review.googlesource.com/784235
Reviewed-by: Misha Efimov <mef@chromium.org>
Reviewed-by: agrieve <agrieve@chromium.org>
Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Commit-Queue: John Budorick <jbudorick@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#519553}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 99a1c15fee4ea06eaae975eb8b7bcdb74adde8a3

android/lint/suppressions.xml

@@ -328,6 +328,16 @@ Still reading?
     <!-- 2 resources used by android webview glue layer, could be refactored -->
     <ignore regexp="android_webview/java/res/drawable-hdpi/ic_play_circle_outline_black_48dp.png"/>
     <ignore regexp="R.string.private_browsing_warning"/>
+    <!-- OMR1 SDK roll mystery. TODO(jbudorick): Remove this after rolling lint. -->
+    <ignore regexp="chrome/android/chrome_strings_grd.resources.zip/values/android_chrome_strings.xml"/>
+    <ignore regexp="chrome/android/java/res/layout/location_bar.xml"/>
+    <ignore regexp="chrome/android/java/res/values/colors.xml"/>
+    <ignore regexp="chrome/android/java/res/values/dimens.xml"/>
+    <ignore regexp="chrome/android/java/res/drawable-hdpi/ic_omnibox_magnifier.png"/>
+    <ignore regexp="chrome/android/java/res/drawable-hdpi/omnibox_https_invalid.png"/>
+    <ignore regexp="chrome/android/java/res/drawable-hdpi/omnibox_info.png"/>
+    <ignore regexp="clank/java/clank_strings_grd.resources.zip/values/android_internal_strings.xml"/>
+    <ignore regexp="tools/android/audio_focus_grabber/java/res/drawable-hdpi/notification_icon.png"/>
   </issue>
   <issue id="UseCompoundDrawables">
     <!-- Upscaling 24dp to 48dp doesn't work as expected with a TextView compound drawable. -->

android/pylib/constants/__init__.py

@@ -95,7 +95,7 @@ DEVICE_PERF_OUTPUT_DIR = (
 
 SCREENSHOTS_DIR = os.path.join(DIR_SOURCE_ROOT, 'out_screenshots')
 
-ANDROID_SDK_VERSION = version_codes.O
+ANDROID_SDK_VERSION = version_codes.O_MR1
 ANDROID_SDK_BUILD_TOOLS_VERSION = '26.0.2'
 ANDROID_SDK_ROOT = os.path.join(DIR_SOURCE_ROOT,
                                 'third_party', 'android_tools', 'sdk')

config/android/config.gni

@@ -30,7 +30,7 @@ if (is_android) {
   } else {
     import("//build/config/android/sdk.gni")
     declare_args() {
-      # Android SDK release. Currently, only "o" is publicly supported.
+      # Android SDK release. Currently, only "o_mr1" is publicly supported.
       android_sdk_release = default_android_sdk_release
     }
   }
@@ -51,11 +51,11 @@ if (is_android) {
     assert(defined(default_android_ndk_major_version))
   }
 
-  if (android_sdk_release == "o") {
+  if (android_sdk_release == "o_mr1") {
     default_android_sdk_root = "//third_party/android_tools/sdk"
-    default_android_sdk_version = "26"
-    default_android_sdk_build_tools_version = "26.0.2"
-    default_android_sdk_tools_version_suffix = "-25.3.2"
+    default_android_sdk_version = "27"
+    default_android_sdk_build_tools_version = "27.0.1"
+    default_android_sdk_tools_version_suffix = "-26.0.0-dev"
     public_android_sdk = true
   }
 

config/android/internal_rules.gni

@@ -770,14 +770,13 @@ if (enable_java_templates) {
         lint_suppressions_file = "//build/android/lint/suppressions.xml"
       }
 
+      _lint_path = "$lint_android_sdk_root/tools-lint/bin/lint"
       _cache_dir = "$root_build_dir/android_lint_cache"
       _result_path = "$target_gen_dir/$target_name/result.xml"
       _config_path = "$target_gen_dir/$target_name/config.xml"
       _suppressions_file = lint_suppressions_file
       _platform_xml_path =
           "${android_sdk_root}/platform-tools/api/api-versions.xml"
-      _rebased_lint_android_sdk_root =
-          rebase_path(lint_android_sdk_root, root_build_dir)
 
       script = "//build/android/gyp/lint.py"
       depfile = "$target_gen_dir/$target_name.d"
@@ -793,7 +792,8 @@ if (enable_java_templates) {
       ]
 
       args = [
-        "--lint-path=$_rebased_lint_android_sdk_root/tools-lint/bin/lint",
+        "--lint-path",
+        rebase_path(_lint_path, root_build_dir),
         "--cache-dir",
         rebase_path(_cache_dir, root_build_dir),
         "--platform-xml-path",

config/android/sdk.gni

@@ -4,7 +4,7 @@
 
 # The default SDK release used by public builds. Value may differ in
 # internal builds.
-default_android_sdk_release = "o"
+default_android_sdk_release = "o_mr1"
 
 # SDK releases against which public builds are supported.
-public_sdk_releases = [ "o" ]
+public_sdk_releases = [ "o_mr1" ]