p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Yifan Hong 2020-12-16 09:49:18 -08:00
parent 63d3835f4a
commit 42cae00cb0
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/product_config.mk
View File

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

11
target/product/base_system.mk
View File

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