Commit 7c4642e0 authored by Peter Wen's avatar Peter Wen Committed by Commit Bot

Android: Update lint target API

Lint target API should be updated when we support new android APIs.

Fixed: 999000
Bug: 999000
Change-Id: Ie724208e04689f2a4c90671f18a8599c258186f0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2156747
Commit-Queue: Peter Wen <wnwen@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Auto-Submit: Peter Wen <wnwen@chromium.org>
Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#760559}
parent 26db7fa3
...@@ -92,7 +92,7 @@ if (is_android || is_chromeos) { ...@@ -92,7 +92,7 @@ if (is_android || is_chromeos) {
# Purposefully repeated so that downstream can change # Purposefully repeated so that downstream can change
# default_android_sdk_root without changing lint version. # default_android_sdk_root without changing lint version.
default_lint_android_sdk_root = public_android_sdk_root default_lint_android_sdk_root = public_android_sdk_root
default_lint_android_sdk_version = 26 default_lint_android_sdk_version = 29
} }
if (!defined(default_extras_android_sdk_root)) { if (!defined(default_extras_android_sdk_root)) {
......
...@@ -854,7 +854,7 @@ if (enable_java_templates) { ...@@ -854,7 +854,7 @@ if (enable_java_templates) {
if (defined(invoker.lint_suppressions_file)) { if (defined(invoker.lint_suppressions_file)) {
lint_suppressions_file = invoker.lint_suppressions_file lint_suppressions_file = invoker.lint_suppressions_file
} else if (!defined(lint_suppressions_file)) { } else {
lint_suppressions_file = "//build/android/lint/suppressions.xml" lint_suppressions_file = "//build/android/lint/suppressions.xml"
} }
...@@ -869,7 +869,7 @@ if (enable_java_templates) { ...@@ -869,7 +869,7 @@ if (enable_java_templates) {
_stamp_path = "$target_out_dir/$target_name/build.lint.stamp" _stamp_path = "$target_out_dir/$target_name/build.lint.stamp"
_suppressions_file = lint_suppressions_file _suppressions_file = lint_suppressions_file
_platform_xml_path = _platform_xml_path =
"${android_sdk_root}/platform-tools/api/api-versions.xml" "$lint_android_sdk_root/platform-tools/api/api-versions.xml"
script = "//build/android/gyp/lint.py" script = "//build/android/gyp/lint.py"
depfile = "$target_gen_dir/$target_name.d" depfile = "$target_gen_dir/$target_name.d"
...@@ -879,7 +879,7 @@ if (enable_java_templates) { ...@@ -879,7 +879,7 @@ if (enable_java_templates) {
_suppressions_file, _suppressions_file,
] ]
# _config_path and _stamp_path are also outputs, but do not list them # _config_path and _result_path are also outputs, but do not list them
# in order to avoid them being uploaded to swarming as part of isolates. # in order to avoid them being uploaded to swarming as part of isolates.
# This happens as a side-effect of lint targets being listed as # This happens as a side-effect of lint targets being listed as
# "data_deps" in order to have them run concurrently with other targets. # "data_deps" in order to have them run concurrently with other targets.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment