Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8ac9951 authored by Colin Cross's avatar Colin Cross
Browse files

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

The coverage infrastructure will use the proguard_usage.zip files
to filter out classes that were stripped by R8.

Test: forrest
Bug: 170337718
Change-Id: Ia7c07770ff520aaf0a8de213edbe22d6fca5b98a
parent 70b47383

core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4925,7 +4925,7 @@ ifeq (true,$(EMMA_INSTRUMENT)) 
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