tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Avoid adding jacocoagent to bootclasspath twice"

Browse source
This commit is contained in:
Paul Duffin 2021-04-14 18:27:59 +00:00 committed by Gerrit Code Review
commit 55e6511331
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
target/product/base_system.mk
View file

@ -291,10 +291,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