summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpkotwicz <pkotwicz@chromium.org>2015-09-28 14:17:46 -0700
committerCommit bot <commit-bot@chromium.org>2015-09-28 21:18:24 +0000
commit5e788688d577c0c8c287f42275c0a4f5df291874 (patch)
tree883a540a5a9cb44503d6be32e1dfbea4967618c9
parent2b3d8ac3b6a34c0b57d8682636dad7d4822dfafb (diff)
downloadchromium_src-5e788688d577c0c8c287f42275c0a4f5df291874.zip
chromium_src-5e788688d577c0c8c287f42275c0a4f5df291874.tar.gz
chromium_src-5e788688d577c0c8c287f42275c0a4f5df291874.tar.bz2
GN: Mark run_findbugs as used in java_library_impl
BUG=536092 TEST=None Review URL: https://codereview.chromium.org/1373873003 Cr-Commit-Position: refs/heads/master@{#351158}
-rw-r--r--build/config/android/internal_rules.gni11
-rw-r--r--third_party/gif_player/BUILD.gn1
2 files changed, 6 insertions, 6 deletions
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
index 00ce47b..0a8f64d 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,8 @@ template("java_library_impl") {
_requires_android =
defined(invoker.requires_android) && invoker.requires_android
assert(_requires_android || true) # Mark as used.
+ _run_findbugs = defined(invoker.run_findbugs) && invoker.run_findbugs
+ assert(_run_findbugs || true) # Mark as used.
if (_supports_android) {
_dex_path = _base_path + ".dex.jar"
@@ -1322,10 +1326,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
diff --git a/third_party/gif_player/BUILD.gn b/third_party/gif_player/BUILD.gn
index f23f1ef..ab0cd6f 100644
--- a/third_party/gif_player/BUILD.gn
+++ b/third_party/gif_player/BUILD.gn
@@ -10,5 +10,4 @@ android_library("gif_player_java") {
"src/jp/tomorrowkey/android/gifplayer/BaseGifImage.java",
]
run_findbugs = false
- assert(!run_findbugs)
}