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

Commit 35f66141 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Move jacocoagent installation to base_system" am: 98b7ac46 am: a88a997a am: a9bfe835 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idcdc828243382d7ae6dc244192abf6d441baafc1
parents c7e99c4a a9bfe835

core/product_config.mk

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

all_product_makefiles :=

all_product_configs :=

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.

# Strip and assign the PRODUCT_ variables.

$(call strip-product-vars)

$(call strip-product-vars)

target/product/base_system.mk

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

   libclang_rt.hwasan-aarch64-android.bootstrap

endif

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

# Host tools to install

PRODUCT_HOST_PACKAGES += \

PRODUCT_HOST_PACKAGES += \

    BugReport \

    BugReport \