Commit 8c21c9fd authored by Yun Liu's avatar Yun Liu Committed by Commit Bot

[code coverage] Don't instrument all Java binaries and annotation processors

FlushingReTrace caused ClassNotFoundException error on bots:
e.g. https://chromium-swarm.appspot.com/task?id=472348a61c76df10

Bug: 985581, 968605
Change-Id: I1d1415f68a8426b81a7c549d0419d32d8a2bd7dc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1790070Reviewed-by: default avatarEric Stevenson <estevenson@chromium.org>
Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Commit-Queue: Yun Liu <yliuyliu@google.com>
Cr-Commit-Position: refs/heads/master@{#695207}
parent 2da81153
......@@ -111,5 +111,4 @@ java_annotation_processor("jni_processor") {
]
srcjar_deps = [ ":processor_args_java" ]
jacoco_never_instrument = true
}
......@@ -7,7 +7,6 @@ import("//build/config/android/rules.gni")
assert(current_toolchain == default_toolchain)
java_binary("java_bytecode_rewriter") {
jacoco_never_instrument = true
java_files = [
"java/org/chromium/bytecode/AssertionEnablerClassAdapter.java",
"java/org/chromium/bytecode/ByteCodeProcessor.java",
......
......@@ -3312,6 +3312,7 @@ if (enable_java_templates) {
if (defined(_final_jar_path)) {
_jacoco_instrument =
jacoco_coverage && _chromium_code && _java_files != [] &&
!_is_java_binary && !_is_annotation_processor &&
(!defined(invoker.testonly) || !invoker.testonly)
if (defined(invoker.jacoco_never_instrument)) {
_jacoco_instrument =
......
......@@ -70,7 +70,6 @@ java_annotation_processor("module_interface_processor") {
"//third_party/android_deps:com_squareup_javapoet_java",
"//third_party/auto:auto_service_java",
]
jacoco_never_instrument = true
}
# Use this one if your target needs to depend on ModuleInstallerConfig. The
......
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