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

Merge "Avoid adding jacocoagent to bootclasspath twice" am: 55e6511331 am: 2b90008ccd am: 2635f9f869

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1675809

Change-Id: I34093b009c2a0149fcf159caede6fae18fb9bb6d
This commit is contained in:
Paul Duffin
2021-04-14 20:39:42 +00:00
committed by Automerger Merge Worker
parent 233397c145 2635f9f869
commit 84c8ff4eb2
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
target/product/base_system.mk
View File

@@ -296,10 +296,16 @@ endif
ifeq ($(EMMA_INSTRUMENT),true)
ifneq ($(EMMA_INSTRUMENT_STATIC),true)
# For instrumented build, if Jacoco is not being included statically
# in instrumented packages then include Jacoco classes into the
# bootclasspath.
# in instrumented packages then include Jacoco classes in the product
# packages.
PRODUCT_PACKAGES += jacocoagent
PRODUCT_BOOT_JARS += jacocoagent
ifneq ($(EMMA_INSTRUMENT_FRAMEWORK),true)
# For instrumented build, if Jacoco is not being included statically
# in instrumented packages and has not already been included in the
# bootclasspath via ART_APEX_JARS then include Jacoco classes into the
# bootclasspath.
PRODUCT_BOOT_JARS += jacocoagent
endif # EMMA_INSTRUMENT_FRAMEWORK
endif # EMMA_INSTRUMENT_STATIC
endif # EMMA_INSTRUMENT