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

Commit 0b2d944d authored by Yu Liu's avatar Yu Liu Committed by Automerger Merge Worker
Browse files

Merge "Add device-tests as a dep of JACOCO_REPORT_CLASSES_ALL." into udc-dev am: c31092cb 

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



Change-Id: I0d1ea3a8689cc3ae6c492a60f37ac76ee3644a47
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f023196e c31092cb

core/Makefile

+8 −0
Original line number Diff line number Diff line
@@ -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