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

Commit 8262fecc authored by Roland Levillain's avatar Roland Levillain Committed by android-build-merger
Browse files

Merge "Remove module `jacocoagent` from `TARGET_CORE_JARS`." 

am: 10954b52

Change-Id: I25003eca86e455f9193278cfdc408db0e39a9d01
parents 30d0d764 10954b52

core/envsetup.mk

+0 −8
Original line number Diff line number Diff line
@@ -259,14 +259,6 @@ endef 
# Java libraries in the ART apex build rule.

ART_APEX_JARS := core-oj core-libart core-icu4j okhttp bouncycastle apache-xml

TARGET_CORE_JARS := $(ART_APEX_JARS) conscrypt

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.

    TARGET_CORE_JARS += jacocoagent

  endif # EMMA_INSTRUMENT_STATIC

endif # EMMA_INSTRUMENT

HOST_CORE_JARS := $(addsuffix -hostdex,$(TARGET_CORE_JARS))

#################################################################

core/product_config.mk

+12 −0
Original line number Diff line number Diff line
@@ -184,6 +184,18 @@ current_product_makefile := 
all_product_makefiles :=

all_product_configs :=



# Jacoco agent JARS to be built and installed, if any.

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.

    $(foreach product,$(PRODUCTS),\

      $(eval PRODUCTS.$(product).PRODUCT_PACKAGES += jacocoagent)\

      $(eval PRODUCTS.$(product).PRODUCT_BOOT_JARS += jacocoagent))

  endif # EMMA_INSTRUMENT_STATIC

endif # EMMA_INSTRUMENT



############################################################################

# Strip and assign the PRODUCT_ variables.

$(call strip-product-vars)