StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move jacocoagent installation to base_system" am: 98b7ac4602

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6075e121d922e630da0e5e58fdbe0d5dfd261724
This commit is contained in:
Treehugger Robot
2020-12-17 00:47:06 +00:00
committed by Automerger Merge Worker
parent 3eeefdca5b 98b7ac4602
commit a88a997a7a
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/product_config.mk
View File

@@ -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)

11
target/product/base_system.mk
View File

@@ -287,6 +287,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 \