commit cfa39194adad3feed0af4fc09d5cbc17e347aeed
author Treehugger Robot <treehugger-gerrit@google.com> Mon Oct 12 20:03:30 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 12 20:03:30 2020 +0000
tree e511763e3135d5c6a8adc5b3b38075e09606b087
parent c75a3c5434b10d440a64f440bde4d0a8d9d81cc3
parent e8ac9951d89807aca07a62fe8ac289eed76dd771

Merge "Package proguard_usage.zip files in jacoco-report-classes-all.jar"

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 2bbf688..110d898 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -4938,7 +4938,7 @@
 JACOCO_REPORT_CLASSES_ALL := $(PRODUCT_OUT)/jacoco-report-classes-all.jar
 $(JACOCO_REPORT_CLASSES_ALL) :
 	@echo "Collecting uninstrumented classes"
-	find $(TARGET_COMMON_OUT_ROOT) $(HOST_COMMON_OUT_ROOT) -name "jacoco-report-classes.jar" 2>/dev/null | sort > $@.list
+	find $(TARGET_COMMON_OUT_ROOT) $(HOST_COMMON_OUT_ROOT) -name "jacoco-report-classes.jar" -o -name "proguard_usage.zip" 2>/dev/null | sort > $@.list
 	$(SOONG_ZIP) -o $@ -L 0 -C $(OUT_DIR) -P out -l $@.list
 
 endif # EMMA_INSTRUMENT=true