commit bee946e8ebb11eeee1f947749c98b485cc662c8f
author Jiyong Park <jiyong@google.com> Wed Jan 08 14:39:54 2020 +0900
committer Jiyong Park <jiyong@google.com> Wed Jan 08 14:41:45 2020 +0900
tree aba919a56562f654c8ce7204021a39495162258e
parent 620a2f2366df7f58821210bf3d8aeb818cd12e69

jacoco-report-classes-all.jar includes jar from other partitions

jacoco-report-classes-all.jar now depends on all installed files
including apks in /apex. Previously, it depended only on files under
system.img and as a result jacoco for other partitions were missing.

Bug: 147296855
Test: m

Change-Id: I755de1205ebc43c197af36a13cca5f4b49e275e8

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index e0bf6ea..0400856 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -1606,7 +1606,7 @@
   endif
 
   ifeq ($(EMMA_INSTRUMENT),true)
-    $(JACOCO_REPORT_CLASSES_ALL) : $(INSTALLED_SYSTEMIMAGE_TARGET)
+    $(JACOCO_REPORT_CLASSES_ALL) : $(modules_to_install)
     $(call dist-for-goals, dist_files, $(JACOCO_REPORT_CLASSES_ALL))
   endif