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

Commit 42cae00c authored by Yifan Hong's avatar Yifan Hong
Browse files

Move jacocoagent installation to base_system 

jacocoagent and its dependencies emits artifacts to system/,
hence it belongs to base_system.mk. It was rather incorrect
to add jacocoagent to EVERY product makefile because those
product makefiles may be enforcing artifact path requirements
(e.g. generic_ramdisk.mk).

Test: EMMA_INSTRUMENT=true m nothing
Bug: 175605139
Bug: 173742069
Change-Id: If9cb93ab8fd69d11e764ab830dc791bbe6106cf5
parent 63d3835f

core/product_config.mk

+0 −12
Original line number Diff line number Diff line
@@ -184,18 +184,6 @@ 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)

target/product/base_system.mk

+11 −0
Original line number Diff line number Diff line
@@ -287,6 +287,17 @@ ifneq (,$(filter hwaddress,$(SANITIZE_TARGET))) 
   libclang_rt.hwasan-aarch64-android.bootstrap

endif



# 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.

    PRODUCT_PACKAGES += jacocoagent

    PRODUCT_BOOT_JARS += jacocoagent

  endif # EMMA_INSTRUMENT_STATIC

endif # EMMA_INSTRUMENT



# Host tools to install

PRODUCT_HOST_PACKAGES += \

    BugReport \