Merge "Add device-tests as a dep of JACOCO_REPORT_CLASSES_ALL." into main
This commit is contained in:
@@ -6889,6 +6889,14 @@ $(JACOCO_REPORT_CLASSES_ALL) :
|
|||||||
ifeq (,$(TARGET_BUILD_UNBUNDLED))
|
ifeq (,$(TARGET_BUILD_UNBUNDLED))
|
||||||
$(JACOCO_REPORT_CLASSES_ALL): $(INTERNAL_ALLIMAGES_FILES)
|
$(JACOCO_REPORT_CLASSES_ALL): $(INTERNAL_ALLIMAGES_FILES)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
# This is not ideal, but it is difficult to correctly figure out the actual jacoco report
|
||||||
|
# jars we need to add here as dependencies, so we add the device-tests as a dependency when
|
||||||
|
# the env variable is set and this should guarantee thaat all the jacoco report jars are ready
|
||||||
|
# when we package the final report jar here.
|
||||||
|
ifeq ($(JACOCO_PACKAGING_INCLUDE_DEVICE_TESTS),true)
|
||||||
|
$(JACOCO_REPORT_CLASSES_ALL): $(COMPATIBILITY.device-tests.FILES)
|
||||||
|
endif
|
||||||
endif # EMMA_INSTRUMENT=true
|
endif # EMMA_INSTRUMENT=true
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user