Merge "Skip instrumenting non-class files"

am: fbe8759872 Change-Id: I218ca550a9848e799b60df9b511930bd9ec2297c
2017-10-26 02:58:10 +00:00 · 2017-10-26 02:58:10 +00:00 · 6449fe47c4
parent 0cd4496235 fbe8759872
commit 6449fe47c4
1 changed files with 1 additions and 0 deletions
--- a/core/jacoco.mk
+++ b/core/jacoco.mk
@ -68,6 +68,7 @@ $(my_unzipped_timestamp_path): $(LOCAL_FULL_CLASSES_PRE_JACOCO_JAR)
 	  -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