Chromium Code Reviews| Index: build/config/android/internal_rules.gni |
| diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni |
| index 00ce47b45ac09a58fac7a62543de01f35c683945..4ff6f3995a97e63cad4ef18868f28223a5bd9d7b 100644 |
| --- a/build/config/android/internal_rules.gni |
| +++ b/build/config/android/internal_rules.gni |
| @@ -489,7 +489,9 @@ template("package_apk") { |
| ]) |
| script = "//build/android/gyp/apkbuilder.py" |
| depfile = "$target_gen_dir/$target_name.d" |
| - data_deps = [ "//tools/android/md5sum" ] # Used when deploying APKs |
| + data_deps = [ |
| + "//tools/android/md5sum", |
| + ] # Used when deploying APKs |
| inputs = [ |
| invoker.resource_packaged_apk_path, |
| @@ -1183,6 +1185,11 @@ template("java_library_impl") { |
| _requires_android = |
| defined(invoker.requires_android) && invoker.requires_android |
| assert(_requires_android || true) # Mark as used. |
| + _run_findbugs = false |
|
agrieve
2015/09/28 20:17:24
nit: other ones right above use:
_run_findbugs =
|
| + if (defined(invoker.run_findbugs)) { |
| + _run_findbugs = invoker.run_findbugs |
| + } |
| + assert(_run_findbugs || true) # Mark as used. |
| if (_supports_android) { |
| _dex_path = _base_path + ".dex.jar" |
| @@ -1322,10 +1329,7 @@ template("java_library_impl") { |
| } |
| } |
| - if (defined(invoker.run_findbugs)) { |
| - run_findbugs = invoker.run_findbugs |
| - } |
| - if (run_findbugs) { |
| + if (_run_findbugs) { |
| _final_datadeps += [ ":${_template_name}__findbugs" ] |
| findbugs("${_template_name}__findbugs") { |
| build_config = _build_config |