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

Commit 2b90008c authored by Paul Duffin's avatar Paul Duffin Committed by Automerger Merge Worker
Browse files

Merge "Avoid adding jacocoagent to bootclasspath twice" am: 55e65113 

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

Change-Id: If2bb9fa5cc433ebf24de26ecd98879e9e658422f
parents f32b2261 55e65113

target/product/base_system.mk

+9 −3
Original line number Diff line number Diff line
@@ -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

    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