Commit 30fbbacb authored by Eric Stevenson's avatar Eric Stevenson Committed by Commit Bot

Android: Add disable_android_lint gn arg.

Lint is slow and annoying when locally prototyping features. This CL
adds a gn arg to disable it globally.

Change-Id: I7a39ea34f4969733ed7562f23e65d997452adc1b
Reviewed-on: https://chromium-review.googlesource.com/1102353
Commit-Queue: Eric Stevenson <estevenson@chromium.org>
Reviewed-by: default avataragrieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#567727}
parent 9165a6ed
...@@ -209,6 +209,9 @@ if (is_android || is_chromeos) { ...@@ -209,6 +209,9 @@ if (is_android || is_chromeos) {
# over the ones in other places. (instead of the support library from # over the ones in other places. (instead of the support library from
# android_tools for example) # android_tools for example)
enable_android_deps_repository = true enable_android_deps_repository = true
# Turns off android lint. Useful for prototyping or for faster local builds.
disable_android_lint = false
} }
# We need a second declare_args block to make sure we are using the overridden # We need a second declare_args block to make sure we are using the overridden
......
...@@ -3040,7 +3040,8 @@ if (enable_java_templates) { ...@@ -3040,7 +3040,8 @@ if (enable_java_templates) {
} }
# TODO(agrieve): Enable lint for _has_sources rather than just _java_files. # TODO(agrieve): Enable lint for _has_sources rather than just _java_files.
_has_lint_target = _java_files != [] && _supports_android && _chromium_code _lint_enabled = _java_files != [] && _supports_android && _chromium_code &&
!disable_android_lint
if (_has_sources) { if (_has_sources) {
_compile_java_target = "${_main_target_name}__compile_java" _compile_java_target = "${_main_target_name}__compile_java"
compile_java(_compile_java_target) { compile_java(_compile_java_target) {
...@@ -3075,12 +3076,16 @@ if (enable_java_templates) { ...@@ -3075,12 +3076,16 @@ if (enable_java_templates) {
} }
_accumulated_public_deps += [ ":$_compile_java_target" ] _accumulated_public_deps += [ ":$_compile_java_target" ]
if (_has_lint_target) { if (defined(invoker.android_manifest_for_lint)) {
_android_manifest_for_lint = invoker.android_manifest_for_lint
assert(_android_manifest_for_lint != "") # Mark as used.
}
if (_lint_enabled) {
android_lint("${_main_target_name}__lint") { android_lint("${_main_target_name}__lint") {
if (invoker.type == "android_apk") { if (invoker.type == "android_apk") {
forward_variables_from(invoker, [ "android_manifest" ]) forward_variables_from(invoker, [ "android_manifest" ])
} else if (defined(invoker.android_manifest_for_lint)) { } else if (defined(_android_manifest_for_lint)) {
android_manifest = invoker.android_manifest_for_lint android_manifest = _android_manifest_for_lint
} }
build_config = _build_config build_config = _build_config
requires_android = _requires_android requires_android = _requires_android
...@@ -3171,7 +3176,7 @@ if (enable_java_templates) { ...@@ -3171,7 +3176,7 @@ if (enable_java_templates) {
# BuildConfig, NativeLibraries, etc. # BuildConfig, NativeLibraries, etc.
input_jar = _unprocessed_jar_path input_jar = _unprocessed_jar_path
output_jar = _final_ijar_path output_jar = _final_ijar_path
if (_has_lint_target) { if (_lint_enabled) {
if (!defined(data_deps)) { if (!defined(data_deps)) {
data_deps = [] data_deps = []
} }
...@@ -3224,7 +3229,7 @@ if (enable_java_templates) { ...@@ -3224,7 +3229,7 @@ if (enable_java_templates) {
"visibility", "visibility",
]) ])
public_deps = _accumulated_public_deps public_deps = _accumulated_public_deps
if (_has_lint_target) { if (_lint_enabled) {
if (!defined(data_deps)) { if (!defined(data_deps)) {
data_deps = [] data_deps = []
} }
......
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