commit fbe8759872572fcdb61474c94bff6e531ac889d9
author Treehugger Robot <treehugger-gerrit@google.com> Thu Oct 26 02:50:01 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 26 02:50:01 2017 +0000
tree d9a190232595ee56212219bc2786f19429f8b1e1
parent 4d85d55e09ee46cf0f5cb779de907eb802e520c1
parent 6fdbdc86f667a33a23470c2d18fac1f983a95991

Merge "Skip instrumenting non-class files"

core/jacoco.mk

diff --git a/core/jacoco.mk b/core/jacoco.mk
index fa31fef..33d45d5 100644
--- a/core/jacoco.mk
+++ b/core/jacoco.mk
@@ -68,6 +68,7 @@
 	  -d $(PRIVATE_UNZIPPED_PATH) \
 	  $(PRIVATE_INCLUDE_ARGS)
 	(cd $(PRIVATE_UNZIPPED_PATH) && rm -rf $(PRIVATE_EXCLUDE_ARGS))
+	(cd $(PRIVATE_UNZIPPED_PATH) && find -not -name "*.class" -type f | xargs --no-run-if-empty rm)
 	touch $(PRIVATE_UNZIPPED_TIMESTAMP_PATH)
 # Unfortunately in the previous task above,
 # 'rm -rf $(PRIVATE_EXCLUDE_ARGS)' needs to be a separate