From a3b623a6eff6dc9d58a03251ae22bccf92f67cb2 Mon Sep 17 00:00:00 2001
From: jbudorick <jbudorick@chromium.org>
Date: Fri, 21 Oct 2016 16:24:56 -0700
Subject: [PATCH] Revert of [Reland] Upgrade to new Android SDK. (patchset #2
 id:20001 of https://codereview.chromium.org/2438133002/ )

Reason for revert:
forward --list issues + gtest perf test adb locations need to be updated.

Original issue's description:
> [Reland] Upgrade to new Android SDK.
>
> https://codereview.chromium.org/2350013004/ was reverted due to breakage on the perf waterfall. After https://codereview.chromium.org/2438563004/, this should hopefully be resolved.
>
> BUG=623989
>
> Committed: https://crrev.com/a8b2a521ccd425935ef26a70e0f65b57de50d788
> Cr-Commit-Position: refs/heads/master@{#426777}

TBR=xunjieli@chromium.org,stip@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=623989

Review-Url: https://chromiumcodereview.appspot.com/2438913004
Cr-Original-Commit-Position: refs/heads/master@{#426926}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 8397f04a7f49909e445d30ccb8d187fedc7959e2
---
 android/BUILD.gn                    |  8 +--
 android/devil_chromium.json         |  6 +-
 android/lint/suppressions.xml       | 99 +----------------------------
 android/pylib/constants/__init__.py |  2 +-
 config/android/config.gni           |  4 +-
 5 files changed, 11 insertions(+), 108 deletions(-)

diff --git a/android/BUILD.gn b/android/BUILD.gn
index e483048f7..688391f9e 100644
--- a/android/BUILD.gn
+++ b/android/BUILD.gn
@@ -112,10 +112,10 @@ group("test_runner_py") {
            "devil_chromium.json",
            "pylib/gtest/filter/",
            "test_wrapper/logdog_wrapper.py",
-           "//third_party/android_tools/sdk/build-tools/24.0.2/aapt",
-           "//third_party/android_tools/sdk/build-tools/24.0.2/dexdump",
-           "//third_party/android_tools/sdk/build-tools/24.0.2/lib64/libc++.so",
-           "//third_party/android_tools/sdk/build-tools/24.0.2/split-select",
+           "//third_party/android_tools/sdk/build-tools/23.0.1/aapt",
+           "//third_party/android_tools/sdk/build-tools/23.0.1/dexdump",
+           "//third_party/android_tools/sdk/build-tools/23.0.1/lib/libc++.so",
+           "//third_party/android_tools/sdk/build-tools/23.0.1/split-select",
            "//third_party/android_tools/sdk/platform-tools/adb",
            "//third_party/catapult/third_party/gsutil/",
            "//third_party/catapult/devil/devil/devil_dependencies.json",
diff --git a/android/devil_chromium.json b/android/devil_chromium.json
index 1f9080d11..c1157fae9 100644
--- a/android/devil_chromium.json
+++ b/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/23.0.1/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/23.0.1/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/23.0.1/split-select"
           ]
         }
       }
diff --git a/android/lint/suppressions.xml b/android/lint/suppressions.xml
index 11eaa974f..f01174bf0 100644
--- a/android/lint/suppressions.xml
+++ b/android/lint/suppressions.xml
@@ -217,22 +217,6 @@ Still reading?
     <ignore path="AndroidManifest.xml"/>
   </issue>
   <issue id="Overdraw" severity="ignore"/>
-  <issue id="Override">
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="org/chromium/content/browser/input/ReplicaInputConnection.class"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="org/chromium/content/browser/input/ThreadedInputConnection.class"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="com/android/webview/chromium/ContentSettingsAdapter.class"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="com/android/webview/chromium/ServiceWorkerControllerAdapter.class"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="com/android/webview/chromium/ServiceWorkerSettingsAdapter.class"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="org/chromium/chrome/browser/ChromeActivity.class"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="org/chromium/chrome/browser/ChromeTabbedActivity.class"/>
-  </issue>
   <issue id="PackageManagerGetSignatures">
     <ignore regexp="chrome/android/webapk/libs/client/src/org/chromium/webapk/lib/client/WebApkValidator.java"/>
   </issue>
@@ -290,8 +274,6 @@ Still reading?
     <ignore regexp="gen/chrome/android/chrome_strings_grd.resources.zip/values-zh-rCN/android_chrome_strings.xml"/>
     <ignore regexp="gen/chrome/android/chrome_strings_grd.resources.zip/values-zh-rTW/android_chrome_strings.xml"/>
   </issue>
-  <!-- TODO(crbug.com/635567): Fix this properly. -->
-  <issue id="UnusedResources" severity="ignore"/>
   <issue id="UnusedResources">
     <ignore regexp="PRODUCT_DIR/gen/remoting/android/remoting_android_raw_resources/res/raw/credits.html"/>
     <ignore regexp="PRODUCT_DIR/gen/remoting/android/remoting_android_raw_resources/res/raw/credits_css.css"/>
@@ -316,8 +298,7 @@ Still reading?
     <ignore regexp="blimp/client/app/android/java/res/values/dimens.xml"/>
     <ignore regexp="blimp/client/app/android/java/res/xml/about_blimp_preferences.xml"/>
     <ignore regexp="blimp/client/app/android/java/res/xml/blimp_preferences.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="chrome/android/java/res/drawable-hdpi/*"/>
+    <ignore regexp="chrome/android/java/res/drawable-hdpi/account_management_incognito.png"/>
     <ignore regexp="chrome/android/java/res/drawable-hdpi/amex_card.png"/>
     <ignore regexp="chrome/android/java/res/drawable-hdpi/bubble_white.9.png"/>
     <ignore regexp="chrome/android/java/res/drawable-hdpi/cvc_icon.png"/>
@@ -379,84 +360,6 @@ Still reading?
     <!-- Used by Android's policies system -->
     <ignore regexp="restriction_values.xml"/>
     <ignore regexp="ui/android/java/res/drawable-hdpi/verify_checkmark.png"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="ui/android/java/res/values/dimens.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="components/autofill/android/java/res/values/dimens.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="components/autofill/android/java/res/drawable/autofill_chip_inset.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="components/autofill/android/java/res/layout/autofill_keyboard_accessory_icon.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="components/autofill/android/java/res/layout/autofill_keyboard_accessory_item.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="content/public/android/java/res/raw/empty.wav"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="content/public/android/java/res/drawable-hdpi/ic_menu_share_holo_light.png"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="content/public/android/java/res/drawable-hdpi/ic_search.png"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="content/public/android/java/res/menu/select_action_menu.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="remoting/android/java/res/menu/chromoting_actionbar.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="remoting/android/java/res/menu/desktop_actionbar.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="remoting/android/java/res/menu/host_context_menu.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="remoting/android/java/res/drawable-hdpi/*"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="content/public/android/java/res/values-v17/styles.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="content/public/android/content_strings_grd.resources.zip/values/android_content_strings.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="components/web_contents_delegate_android/android/java/res/drawable-hdpi/bubble.9.png"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="components/web_contents_delegate_android/android/java/res/drawable-hdpi/bubble_arrow_up.png"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="components/web_contents_delegate_android/android/java/res/drawable-hdpi/ic_warning.png"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="components/web_contents_delegate_android/android/java/res/layout/validation_message_bubble.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="content/shell/android/java/res/drawable/ic_refresh.png"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="content/shell/android/java/res/drawable/progress.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="content/shell/android/java/res/layout/shell_view.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="content/shell/android/java/res/values/strings.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="android_webview/test/shell/res/values/config.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="android_webview/test/shell/res/layout/testshell_activity.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="chrome/android/java/res/anim/accelerate_quart.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="chrome/android/java/res/layout/accessibility_tab_switcher.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="chrome/android/java/res/drawable/accessibility_tab_switcher_divider.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="chrome/android/java/res/layout/accessibility_tab_switcher_list_item.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="chrome/android/java/res/layout/account_chooser_dialog_item.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="chrome/android/java/res/layout/account_chooser_dialog_title.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="chrome/android/java/res/drawable-hdpi/account_management_no_picture.png"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="chrome/android/java/res/xml/account_management_preferences.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="chrome/android/java/res/anim/activity_close_exit.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="chrome/android/java/res/anim/activity_open_enter.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="chrome/android/chrome_strings_grd.resources.zip/values/android_chrome_strings.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="content/shell/android/shell_apk/res/layout/content_shell_activity.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="content/shell/android/linker_test_apk/res/layout/test_activity.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="content/shell/android/shell_apk/res/values/strings.xml"/>
   </issue>
   <issue id="UseCompoundDrawables">
     <ignore regexp="chrome/android/java/res/layout/download_content.xml"/>
diff --git a/android/pylib/constants/__init__.py b/android/pylib/constants/__init__.py
index 122ae98cf..9b25dcd07 100644
--- a/android/pylib/constants/__init__.py
+++ b/android/pylib/constants/__init__.py
@@ -96,7 +96,7 @@ DEVICE_PERF_OUTPUT_DIR = (
 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 = '23.0.1'
 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/config/android/config.gni b/config/android/config.gni
index 90547cd5d..1978fa24d 100644
--- a/config/android/config.gni
+++ b/config/android/config.gni
@@ -35,8 +35,8 @@ 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 = "23"
+    default_android_sdk_build_tools_version = "23.0.1"
   }
 
   if (!defined(default_lint_android_sdk_root)) {