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

Commit 55e65113 authored by Paul Duffin's avatar Paul Duffin Committed by Gerrit Code Review
Browse files

Merge "Avoid adding jacocoagent to bootclasspath twice"

parents 4cce23d7 2e046e6c

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