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

Commit 8cd718ee authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Package proguard_usage.zip files in jacoco-report-classes-all.jar" am: cfa39194 am: dbd01229 am: 9913f9ae

Original change: https://android-review.googlesource.com/c/platform/build/+/1456639

Change-Id: I1add122155c932667d54d74325f2417f4decba2e
parents 3bd271c0 9913f9ae

core/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -4938,7 +4938,7 @@ ifeq (true,$(EMMA_INSTRUMENT)) 
JACOCO_REPORT_CLASSES_ALL := $(PRODUCT_OUT)/jacoco-report-classes-all.jar

JACOCO_REPORT_CLASSES_ALL := $(PRODUCT_OUT)/jacoco-report-classes-all.jar

$(JACOCO_REPORT_CLASSES_ALL) :

$(JACOCO_REPORT_CLASSES_ALL) :

	@echo "Collecting uninstrumented classes"

	@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

	$(SOONG_ZIP) -o $@ -L 0 -C $(OUT_DIR) -P out -l $@.list





endif # EMMA_INSTRUMENT=true

endif # EMMA_INSTRUMENT=true