StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add device-tests as a dep of JACOCO_REPORT_CLASSES_ALL.

Browse Source 
Bug: 289380707
Test: CI
(cherry picked from https://android-review.googlesource.com/q/commit:affd00883f33b86d1977ed69ca37fd7c5c36bf29)
Merged-In: Id201bda1bd4acfc6cadada982e20dee19d8c703a
Change-Id: Id201bda1bd4acfc6cadada982e20dee19d8c703a
This commit is contained in:
Yu Liu
2023-08-11 12:59:45 -07:00
committed by Cherrypicker Worker
parent fa2b8b1567
commit 5101ccd905
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/Makefile
View File

@@ -6588,6 +6588,14 @@ $(JACOCO_REPORT_CLASSES_ALL) :
ifeq (,$(TARGET_BUILD_UNBUNDLED))
$(JACOCO_REPORT_CLASSES_ALL): $(INTERNAL_ALLIMAGES_FILES)
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