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

Commit 2e046e6c authored by Paul Duffin's avatar Paul Duffin
Browse files

Avoid adding jacocoagent to bootclasspath twice 

Previously:
* If EMMA_INSTRUMENT_FRAMEWORK=true then jacocoagent was
  added to the ART_APEX_JARS which itself is added to
  PRODUCT_BOOT_JARS.
* If EMMA_INSTRUMENT=true then it was added directly to the
  PRODUCT_BOOT_JARS.
* If both were true then it was added in both places ending up on the
  bootclasspath twice.

Bug: 185369704
Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true droid
      m droid
Change-Id: Id1d4d1c98455cb2859ed5e4071a0cf14fb40eec4
parent 002dd30e

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