From 8397f04a7f49909e445d30ccb8d187fedc7959e2 Mon Sep 17 00:00:00 2001 From: jbudorick 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-Commit-Position: refs/heads/master@{#426926} --- DEPS | 2 +- build/android/BUILD.gn | 8 +- build/android/devil_chromium.json | 6 +- build/android/lint/suppressions.xml | 99 +-------------------- build/android/pylib/constants/__init__.py | 2 +- build/config/android/config.gni | 4 +- components/cronet/android/api/build.xml | 2 +- components/cronet/tools/generate_javadoc.py | 12 +-- docs/android_test_instructions.md | 4 +- tools/android/eclipse/.classpath | 6 +- 10 files changed, 21 insertions(+), 124 deletions(-) diff --git a/DEPS b/DEPS index a72e6bdfbb6c4a..c430c95b295825 100644 --- a/DEPS +++ b/DEPS @@ -428,7 +428,7 @@ deps_os = { Var('chromium_git') + '/external/android_protobuf.git' + '@' + '999188d0dc72e97f7fe08bb756958a2cf090f4e7', 'src/third_party/android_tools': - Var('chromium_git') + '/android_tools.git' + '@' + '3d6ba29a6693bf3db1343fc213eea47c7d940413', + Var('chromium_git') + '/android_tools.git' + '@' + '25d57ead05d3dfef26e9c19b13ed10b0a69829cf', 'src/third_party/apache-mime4j': Var('chromium_git') + '/chromium/deps/apache-mime4j.git' + '@' + '28cb1108bff4b6cf0a2e86ff58b3d025934ebe3a', diff --git a/build/android/BUILD.gn b/build/android/BUILD.gn index e483048f744c91..688391f9e1f670 100644 --- a/build/android/BUILD.gn +++ b/build/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/build/android/devil_chromium.json b/build/android/devil_chromium.json index 1f9080d115d975..c1157fae9eff78 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/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/build/android/lint/suppressions.xml b/build/android/lint/suppressions.xml index 11eaa974fa1533..f01174bf02c1d3 100644 --- a/build/android/lint/suppressions.xml +++ b/build/android/lint/suppressions.xml @@ -217,22 +217,6 @@ Still reading? - - - - - - - - - - - - - - - - @@ -290,8 +274,6 @@ Still reading? - - @@ -316,8 +298,7 @@ Still reading? - - + @@ -379,84 +360,6 @@ Still reading? - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/android/pylib/constants/__init__.py b/build/android/pylib/constants/__init__.py index 122ae98cf8ca46..9b25dcd07ca7ff 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 = '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/build/config/android/config.gni b/build/config/android/config.gni index 90547cd5d0ed33..1978fa24da2744 100644 --- a/build/config/android/config.gni +++ b/build/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)) { diff --git a/components/cronet/android/api/build.xml b/components/cronet/android/api/build.xml index 4eb2cc6245f2b9..1f08a8263f5463 100644 --- a/components/cronet/android/api/build.xml +++ b/components/cronet/android/api/build.xml @@ -2,7 +2,7 @@ diff --git a/components/cronet/tools/generate_javadoc.py b/components/cronet/tools/generate_javadoc.py index 7a4b98925861e9..3914b91ed23564 100755 --- a/components/cronet/tools/generate_javadoc.py +++ b/components/cronet/tools/generate_javadoc.py @@ -43,15 +43,9 @@ def GenerateJavadoc(options, src_dir): '-Dlib.java.dir=' + lib_java_dir, '-Doverview=' + overview_file, 'doc'] stdout = build_utils.CheckOutput(javadoc_cmd, cwd=working_dir) - for line in stdout.splitlines(): - if " error: " in line or "javadoc: error " in line: - build_utils.DeleteDirectory(output_dir) - raise build_utils.CalledProcessError(working_dir, javadoc_cmd, stdout) - # TODO(crbug.com/655666): remove compiler suppression warning once fixed. - if ("warning" in line and not line.endswith('warnings') and - not "the highest major version" in line): - build_utils.DeleteDirectory(output_dir) - raise build_utils.CalledProcessError(working_dir, javadoc_cmd, stdout) + if " error: " in stdout or "warning" in stdout or "javadoc: error " in stdout: + build_utils.DeleteDirectory(output_dir) + raise build_utils.CalledProcessError(working_dir, javadoc_cmd, stdout) def main(): diff --git a/docs/android_test_instructions.md b/docs/android_test_instructions.md index 3449a022948ccd..6524177a06f464 100644 --- a/docs/android_test_instructions.md +++ b/docs/android_test_instructions.md @@ -152,11 +152,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-23/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-23/x86/userdata.img ``` ## Symbolizing Crashes diff --git a/tools/android/eclipse/.classpath b/tools/android/eclipse/.classpath index 5197571f3b403f..520b42a4eac58e 100644 --- a/tools/android/eclipse/.classpath +++ b/tools/android/eclipse/.classpath @@ -212,13 +212,13 @@ to the classpath for downstream development. See "additional_entries" below. - + - - + +